diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..5e4dc43
Binary files /dev/null and b/dist.zip differ
diff --git a/generate/php/app/adminapi/controller/oa/FlowTypeController.php b/generate/php/app/adminapi/controller/oa/FlowTypeController.php
deleted file mode 100644
index 35cbcce..0000000
--- a/generate/php/app/adminapi/controller/oa/FlowTypeController.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-
-namespace app\adminapi\controller\oa;
-
-
-use app\adminapi\controller\BaseAdminController;
-use app\adminapi\lists\oa\FlowTypeLists;
-use app\adminapi\logic\oa\FlowTypeLogic;
-use app\adminapi\validate\oa\FlowTypeValidate;
-
-
-/**
- * 审批类型控制器
- * Class FlowTypeController
- * @package app\adminapi\controller\oa
- */
-class FlowTypeController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取审批类型列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function lists()
-    {
-        return $this->dataLists(new FlowTypeLists());
-    }
-
-
-    /**
-     * @notes 添加审批类型
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function add()
-    {
-        $params = (new FlowTypeValidate())->post()->goCheck('add');
-        $result = FlowTypeLogic::add($params);
-        if (true === $result) {
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(FlowTypeLogic::getError());
-    }
-
-
-    /**
-     * @notes 编辑审批类型
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function edit()
-    {
-        $params = (new FlowTypeValidate())->post()->goCheck('edit');
-        $result = FlowTypeLogic::edit($params);
-        if (true === $result) {
-            return $this->success('编辑成功', [], 1, 1);
-        }
-        return $this->fail(FlowTypeLogic::getError());
-    }
-
-
-    /**
-     * @notes 删除审批类型
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function delete()
-    {
-        $params = (new FlowTypeValidate())->post()->goCheck('delete');
-        FlowTypeLogic::delete($params);
-        return $this->success('删除成功', [], 1, 1);
-    }
-
-
-    /**
-     * @notes 获取审批类型详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function detail()
-    {
-        $params = (new FlowTypeValidate())->goCheck('detail');
-        $result = FlowTypeLogic::detail($params);
-        return $this->data($result);
-    }
-
-
-}
\ No newline at end of file
diff --git a/generate/php/app/adminapi/lists/oa/FlowTypeLists.php b/generate/php/app/adminapi/lists/oa/FlowTypeLists.php
deleted file mode 100644
index 8f376d8..0000000
--- a/generate/php/app/adminapi/lists/oa/FlowTypeLists.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-namespace app\adminapi\lists\oa;
-
-
-use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\oa\FlowType;
-use app\common\lists\ListsSearchInterface;
-
-
-/**
- * 审批类型列表
- * Class FlowTypeLists
- * @package app\adminapi\listsoa
- */
-class FlowTypeLists extends BaseAdminDataLists implements ListsSearchInterface
-{
-
-
-    /**
-     * @notes 设置搜索条件
-     * @return \string[][]
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function setSearch(): array
-    {
-        return [
-            '=' => ['type'],
-            '%like%' => ['title'],
-        ];
-    }
-
-
-    /**
-     * @notes 获取审批类型列表
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function lists(): array
-    {
-        return FlowType::where($this->searchWhere)
-            ->field(['id', 'type', 'title', 'name', 'department_ids', 'status'])
-            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
-    }
-
-
-    /**
-     * @notes 获取审批类型数量
-     * @return int
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function count(): int
-    {
-        return FlowType::where($this->searchWhere)->count();
-    }
-
-}
\ No newline at end of file
diff --git a/generate/php/app/adminapi/logic/oa/FlowTypeLogic.php b/generate/php/app/adminapi/logic/oa/FlowTypeLogic.php
deleted file mode 100644
index e6e2f18..0000000
--- a/generate/php/app/adminapi/logic/oa/FlowTypeLogic.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-namespace app\adminapi\logic\oa;
-
-
-use app\common\model\oa\FlowType;
-use app\common\logic\BaseLogic;
-use think\facade\Db;
-
-
-/**
- * 审批类型逻辑
- * Class FlowTypeLogic
- * @package app\adminapi\logic\oa
- */
-class FlowTypeLogic extends BaseLogic
-{
-
-
-    /**
-     * @notes 添加审批类型
-     * @param array $params
-     * @return bool
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public static function add(array $params): bool
-    {
-        Db::startTrans();
-        try {
-            FlowType::create([
-                'type' => $params['type'],
-                'title' => $params['title'],
-                'name' => $params['name'],
-                'department_ids' => $params['department_ids'],
-                'status' => $params['status']
-            ]);
-
-            Db::commit();
-            return true;
-        } catch (\Exception $e) {
-            Db::rollback();
-            self::setError($e->getMessage());
-            return false;
-        }
-    }
-
-
-    /**
-     * @notes 编辑审批类型
-     * @param array $params
-     * @return bool
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public static function edit(array $params): bool
-    {
-        Db::startTrans();
-        try {
-            FlowType::where('id', $params['id'])->update([
-                'type' => $params['type'],
-                'title' => $params['title'],
-                'name' => $params['name'],
-                'department_ids' => $params['department_ids'],
-                'status' => $params['status']
-            ]);
-
-            Db::commit();
-            return true;
-        } catch (\Exception $e) {
-            Db::rollback();
-            self::setError($e->getMessage());
-            return false;
-        }
-    }
-
-
-    /**
-     * @notes 删除审批类型
-     * @param array $params
-     * @return bool
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public static function delete(array $params): bool
-    {
-        return FlowType::destroy($params['id']);
-    }
-
-
-    /**
-     * @notes 获取审批类型详情
-     * @param $params
-     * @return array
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public static function detail($params): array
-    {
-        return FlowType::findOrEmpty($params['id'])->toArray();
-    }
-}
\ No newline at end of file
diff --git a/generate/php/app/adminapi/validate/oa/FlowTypeValidate.php b/generate/php/app/adminapi/validate/oa/FlowTypeValidate.php
deleted file mode 100644
index f401d9e..0000000
--- a/generate/php/app/adminapi/validate/oa/FlowTypeValidate.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-namespace app\adminapi\validate\oa;
-
-
-use app\common\validate\BaseValidate;
-
-
-/**
- * 审批类型验证器
- * Class FlowTypeValidate
- * @package app\adminapi\validate\oa
- */
-class FlowTypeValidate extends BaseValidate
-{
-
-     /**
-      * 设置校验规则
-      * @var string[]
-      */
-    protected $rule = [
-        'id' => 'require',
-        'type' => 'require',
-        'title' => 'require',
-        'name' => 'require',
-        'department_ids' => 'require',
-        'status' => 'require',
-    ];
-
-
-    /**
-     * 参数描述
-     * @var string[]
-     */
-    protected $field = [
-        'id' => 'id',
-        'type' => '所属分类',
-        'title' => '审批名称',
-        'name' => '审批标识',
-        'department_ids' => '应用部门',
-        'status' => '状态',
-    ];
-
-
-    /**
-     * @notes 添加场景
-     * @return FlowTypeValidate
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function sceneAdd()
-    {
-        return $this->only(['type','title','name','department_ids','status']);
-    }
-
-
-    /**
-     * @notes 编辑场景
-     * @return FlowTypeValidate
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function sceneEdit()
-    {
-        return $this->only(['id','type','title','name','department_ids','status']);
-    }
-
-
-    /**
-     * @notes 删除场景
-     * @return FlowTypeValidate
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function sceneDelete()
-    {
-        return $this->only(['id']);
-    }
-
-
-    /**
-     * @notes 详情场景
-     * @return FlowTypeValidate
-     * @author likeadmin
-     * @date 2024/01/31 14:15
-     */
-    public function sceneDetail()
-    {
-        return $this->only(['id']);
-    }
-
-}
\ No newline at end of file
diff --git a/generate/php/app/common/model/oa/FlowType.php b/generate/php/app/common/model/oa/FlowType.php
deleted file mode 100644
index f45b5a4..0000000
--- a/generate/php/app/common/model/oa/FlowType.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-namespace app\common\model\oa;
-
-
-use app\common\model\BaseModel;
-use think\model\concern\SoftDelete;
-
-
-/**
- * 审批类型模型
- * Class FlowType
- * @package app\common\model\oa
- */
-class FlowType extends BaseModel
-{
-    use SoftDelete;
-    protected $name = 'flow_type';
-    protected $deleteTime = 'delete_time';
-
-    
-}
\ No newline at end of file
diff --git a/generate/sql/menu.sql b/generate/sql/menu.sql
deleted file mode 100644
index 1d217ed..0000000
--- a/generate/sql/menu.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-INSERT INTO `gc_system_menu`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`)
- VALUES (1029, 'C', '审批类型', '', 1, 'oa.flow_type/lists', 'flow_type', 'flow_type/index', '', '', 0, 1, 0, 1706681745, 1706681745);
-
-SELECT @pid := LAST_INSERT_ID();
-
-INSERT INTO `gc_system_menu`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`)
- VALUES (@pid, 'A', '添加', '', 1, 'oa.flow_type/add', '', '', '', '', 0, 1, 0, 1706681745, 1706681745);
-
-INSERT INTO `gc_system_menu`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`)
- VALUES (@pid, 'A', '编辑', '', 1, 'oa.flow_type/edit', '', '', '', '', 0, 1, 0, 1706681745, 1706681745);
-
-INSERT INTO `gc_system_menu`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`)
- VALUES (@pid, 'A', '删除', '', 1, 'oa.flow_type/delete', '', '', '', '', 0, 1, 0, 1706681745, 1706681745);
diff --git a/generate/vue/src/views/flow_type/edit.vue b/generate/vue/src/views/flow_type/edit.vue
deleted file mode 100644
index 6d0b93d..0000000
--- a/generate/vue/src/views/flow_type/edit.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<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="type">
-                    <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择所属分类">
-                        <el-option 
-                            v-for="(item, index) in dictData.flow_type"
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
-                    </el-select>
-                </el-form-item>
-                <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="department_ids">
-                    <el-input v-model="formData.department_ids" clearable placeholder="请输入应用部门" />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-radio-group v-model="formData.status" placeholder="请选择状态">
-                        <el-radio 
-                            v-for="(item, index) in dictData.show_status"
-                            :key="index"
-                            :label="parseInt(item.value)"
-                        >
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="flowTypeEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiFlowTypeAdd, apiFlowTypeEdit, apiFlowTypeDetail } from '@/api/flow_type'
-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: '',
-    type: '',
-    title: '',
-    name: '',
-    department_ids: '',
-    status: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    type: [{
-        required: true,
-        message: '请选择所属分类',
-        trigger: ['blur']
-    }],
-    title: [{
-        required: true,
-        message: '请输入审批名称',
-        trigger: ['blur']
-    }],
-    name: [{
-        required: true,
-        message: '请输入审批标识',
-        trigger: ['blur']
-    }],
-    department_ids: [{
-        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 apiFlowTypeDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiFlowTypeEdit(data) 
-        : await apiFlowTypeAdd(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/generate/vue/src/views/flow_type/index.vue b/generate/vue/src/views/flow_type/index.vue
deleted file mode 100644
index eae430b..0000000
--- a/generate/vue/src/views/flow_type/index.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<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 class="w-[280px]" v-model="queryParams.type" clearable placeholder="请选择所属分类">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option 
-                            v-for="(item, index) in dictData.flow_type"
-                            :key="index" 
-                            :label="item.name"
-                            :value="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>
-                    <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="['oa.flow_type/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['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">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.flow_type" :value="row.type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="审批名称" prop="title" show-overflow-tooltip />
-                    <el-table-column label="审批标识" prop="name" show-overflow-tooltip />
-                    <el-table-column label="应用部门" prop="department_ids" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.show_status" :value="row.status" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['oa.flow_type/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['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" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="flowTypeLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiFlowTypeLists, apiFlowTypeDelete } from '@/api/flow_type'
-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({
-    type: '',
-    title: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('flow_type,show_status')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiFlowTypeLists,
-    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 apiFlowTypeDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
diff --git a/src/components/flowProcess/index.vue b/src/components/flowProcess/index.vue
new file mode 100644
index 0000000..d91a125
--- /dev/null
+++ b/src/components/flowProcess/index.vue
@@ -0,0 +1,49 @@
+<template>
+    <el-row>
+        <el-col :span="24">
+            <el-form-item label="选择审批流程" prop="mailing_no">
+                <el-select class="flex-1" v-model="a" clearable placeholder="选择审批流程">
+                    <el-option v-for="(item, index) in flowList" :key="index" :label="item.name" :value="item.value" />
+                </el-select>
+            </el-form-item>
+        </el-col>
+    </el-row>
+    <el-row>
+        <el-col :span="24">
+            <el-form-item label="审批流程" prop="mailing_no">
+                <el-steps :active="2" style="width:100%" finish-status="success" align-center>
+                    <el-step title="第一级审批" description="当前部门负责人" />
+                    <el-step title="第二级审批" description="当前部门负责人" />
+                    <el-step title="第三级审批(会签)" description="当前部门负责人" />
+                </el-steps>
+            </el-form-item>
+        </el-col>
+    </el-row>
+    <el-row>
+        <el-col :span="24">
+            <el-form-item label="抄送人" prop="mailing_no">
+                <el-tag class="ml-2">究极张伟</el-tag>
+                <el-tag class="ml-2"> 究极张伟</el-tag>
+                <el-tag class="ml-2">究极张伟</el-tag>
+            </el-form-item>
+        </el-col>
+    </el-row>
+</template>
+<script setup>
+import { ref, reactive } from 'vue'
+const a = ref('')
+const flowList = reactive([
+    {
+        name: "究极张伟",
+        value: 1
+    },
+    {
+        name: "究极张2",
+        value: 2
+    },
+])
+
+
+
+</script>
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/personnelselector/index.vue b/src/components/personnelselector/index.vue
index de4a2c4..30050d1 100644
--- a/src/components/personnelselector/index.vue
+++ b/src/components/personnelselector/index.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="edit-popup">
-
         <el-dialog v-model="dialogVisible" title="人员选择器" width="600px" :before-close="handleClose">
             <div>
                 <el-radio-group v-model="isCollapse" style="margin-bottom: 20px">
@@ -12,7 +11,6 @@
 
                 <div v-if="type == 1">
                     <div v-if="isCollapse == 1" style="margin-bottom: 20px">
-                        <!-- <el-input v-model="content" clearable placeholder="搜索人员" /> -->
                         <div style="margin-top: 20px">
                             <el-radio-group v-model="radionum">
                                 <el-radio :label="item" v-for="(item, i) in uesrlist" :key="i" style="margin-bottom: 20px;">
@@ -23,7 +21,6 @@
                                         <div class="radiob">
                                             <div class="radiob_a">{{ item.name }}</div>
                                             <div class="radiob_b">
-                                                <!-- {{ item.org_name }}/{{ item.dept_name }}/{{ item.job_name }} -->
                                                 <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
                                                 <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
                                                 <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
@@ -39,19 +36,17 @@
                         <div v-if="isshow">
                             <div class="lad" v-for="(item, i) in deparmetlist" :key="i">
                                 <div class="lad">{{ i }}</div>
-                                <div class="flex " v-for="(items, k) in item" style="justify-content: space-between;" @click="deparmetclck(items)">
+                                <div class="flex " v-for="(items, k) in item" style="justify-content: space-between;"
+                                    @click="deparmetclck(items)">
                                     <div>{{ items.name }}</div>
                                     <div class="Collapsebj">{{ items.admin_num }}</div>
                                 </div>
                             </div>
                         </div>
                         <div v-else>
-
-
-                            <!-- <el-input v-model="content" clearable placeholder="搜索人员" style="margin-bottom: 20px;" /> -->
-
                             <el-radio-group v-model="radionum">
-                                <el-radio :label="item" v-for="(item, i) in deparmetlist1" :key="i" style="margin-bottom: 20px;">
+                                <el-radio :label="item" v-for="(item, i) in deparmetlist1" :key="i"
+                                    style="margin-bottom: 20px;">
                                     <div class="radio-con">
                                         <div class="radioa">
                                             <img :src="item.avatar" alt="" />
@@ -59,7 +54,6 @@
                                         <div class="radiob">
                                             <div class="radiob_a">{{ item.name }}</div>
                                             <div class="radiob_b">
-
                                                 <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
                                                 <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
                                                 <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
@@ -72,15 +66,16 @@
                     </div>
                     <div v-if="isCollapse == 3">
                         <div class="lad " v-if="isshow1">
-                            <div class="flex " v-for="(item, j) in jobslist" :key="j" style="justify-content: space-between;" @click="gwclck(item)">
+                            <div class="flex " v-for="(item, j) in jobslist" :key="j"
+                                style="justify-content: space-between;" @click="gwclck(item)">
                                 <div>{{ item.name }}</div>
                                 <div class="Collapsebj">{{ item.admin_num }}</div>
                             </div>
                         </div>
                         <div v-else>
-                            <!-- <el-input v-model="content" clearable placeholder="搜索人员" style="margin-bottom: 20px;" /> -->
                             <el-radio-group v-model="radionum">
-                                <el-radio :label="item" v-for="(item, i) in jobslist1" :key="i" style="margin-bottom: 20px;">
+                                <el-radio :label="item" v-for="(item, i) in jobslist1" :key="i"
+                                    style="margin-bottom: 20px;">
                                     <div class="radio-con">
                                         <div class="radioa">
                                             <img :src="item.avatar" alt="" />
@@ -88,7 +83,6 @@
                                         <div class="radiob">
                                             <div class="radiob_a">{{ item.name }}</div>
                                             <div class="radiob_b">
-                                                <!-- {{ item.org_name }}/{{ item.dept_name }}/{{ item.job_name }} -->
                                                 <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
                                                 <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
                                                 <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
@@ -103,13 +97,11 @@
 
                 </div>
                 <div v-else>
-
-
                     <div v-if="isCollapse == 1" style="margin-bottom: 20px">
-                        <!-- <el-input v-model="content" clearable placeholder="搜索人员" /> -->
                         <div style="margin-top: 20px">
                             <el-checkbox-group v-model="radiolist">
-                                <el-checkbox :label="item" v-for="(item, i) in uesrlist" :key="i" style="margin-bottom: 20px;">
+                                <el-checkbox :label="item" v-for="(item, i) in uesrlist" :key="i"
+                                    style="margin-bottom: 20px;">
                                     <div class="radio-con">
                                         <div class="radioa">
                                             <img :src="item.avatar" alt="" />
@@ -117,11 +109,9 @@
                                         <div class="radiob">
                                             <div class="radiob_a">{{ item.name }}</div>
                                             <div class="radiob_b">
-                                                <!-- {{ item.org_name }}/{{ item.dept_name }}/{{ item.job_name }} -->
                                                 <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
                                                 <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
                                                 <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
-
                                             </div>
                                         </div>
                                     </div>
@@ -133,19 +123,17 @@
                         <div v-if="isshow">
                             <div class="lad" v-for="(item, i) in deparmetlist" :key="i">
                                 <div class="lad">{{ i }}</div>
-                                <div class="flex " v-for="(items, k) in item" style="justify-content: space-between;" @click="deparmetclck(items)">
+                                <div class="flex " v-for="(items, k) in item" style="justify-content: space-between;"
+                                    @click="deparmetclck(items)">
                                     <div>{{ items.name }}</div>
                                     <div class="Collapsebj">{{ items.admin_num }}</div>
                                 </div>
                             </div>
                         </div>
                         <div v-else>
-
-
-                            <!-- <el-input v-model="content" clearable placeholder="搜索人员" style="margin-bottom: 20px;" /> -->
-
                             <el-checkbox-group v-model="radiolist">
-                                <el-checkbox :label="item" v-for="(item, i) in deparmetlist1" :key="i" style="margin-bottom: 20px;">
+                                <el-checkbox :label="item" v-for="(item, i) in deparmetlist1" :key="i"
+                                    style="margin-bottom: 20px;">
                                     <div class="radio-con">
                                         <div class="radioa">
                                             <img :src="item.avatar" alt="" />
@@ -153,7 +141,6 @@
                                         <div class="radiob">
                                             <div class="radiob_a">{{ item.name }}</div>
                                             <div class="radiob_b">
-
                                                 <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
                                                 <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
                                                 <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
@@ -166,15 +153,16 @@
                     </div>
                     <div v-if="isCollapse == 3">
                         <div class="lad " v-if="isshow1">
-                            <div class="flex " v-for="(item, j) in jobslist" :key="j" style="justify-content: space-between;" @click="gwclck(item)">
+                            <div class="flex " v-for="(item, j) in jobslist" :key="j"
+                                style="justify-content: space-between;" @click="gwclck(item)">
                                 <div>{{ item.name }}</div>
                                 <div class="Collapsebj">{{ item.admin_num }}</div>
                             </div>
                         </div>
                         <div v-else>
-                            <!-- <el-input v-model="content" clearable placeholder="搜索人员" style="margin-bottom: 20px;" /> -->
                             <el-checkbox-group v-model="radiolist">
-                                <el-checkbox :label="item" v-for="(item, i) in jobslist1" :key="i" style="margin-bottom: 20px;">
+                                <el-checkbox :label="item" v-for="(item, i) in jobslist1" :key="i"
+                                    style="margin-bottom: 20px;">
                                     <div class="radio-con">
                                         <div class="radioa">
                                             <img :src="item.avatar" alt="" />
@@ -182,7 +170,6 @@
                                         <div class="radiob">
                                             <div class="radiob_a">{{ item.name }}</div>
                                             <div class="radiob_b">
-                                                <!-- {{ item.org_name }}/{{ item.dept_name }}/{{ item.job_name }} -->
                                                 <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
                                                 <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
                                                 <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
@@ -195,8 +182,6 @@
                         </div>
                     </div>
                 </div>
-
-
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -211,11 +196,8 @@
 </template>
 
 <script lang="ts" setup name="projectPreSalesMembersEdit">
-import type { FormInstance } from 'element-plus'
-import { computed, nextTick, onMounted, reactive, shallowRef, watch } from 'vue'
+import { reactive } from 'vue'
 import { getAdminsByAll, getAllDept, getAllJobs, getAdminsByDept, getAdminsByJob } from '@/api/common'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
 import type { PropType } from 'vue'
 import { defineEmits } from "vue"
 const leixin = ref('0')
@@ -239,12 +221,9 @@ const isshow1 = ref(true);
 const radiolist = ref([])
 const radionum = ref([])
 
-const showDialog = ref(false)
-
 // 获取全部人员
 const getlist = () => {
     getAdminsByAll().then((res) => {
-        // console.log(res)
         Object.assign(uesrlist, res)
     })
 }
@@ -252,13 +231,11 @@ const getlist = () => {
 //获取所有部门
 const deparmet = () => {
     getAllDept().then((res) => {
-        console.log(res)
         Object.assign(deparmetlist, res)
     })
 }
 //获取部门下的人员
 const deparmetclck = (item: { id: any }) => {
-    console.log(item)
     getAdminsByDept({ 'dept_id': item.id }).then((res) => {
         if (res.length > 0) {
             Object.assign(deparmetlist1, res)
@@ -272,7 +249,6 @@ const deparmetclck = (item: { id: any }) => {
 
 const Jobs = () => {
     getAllJobs().then((res) => {
-        console.log(res)
         Object.assign(jobslist, res)
     })
 }
@@ -302,7 +278,6 @@ const open = (e: any) => {
 //获取选择的数据
 const userclick = () => {
     dialogVisible.value = false
-    // console.log(props, radionum.value, 9999999999999)
     if (props.type == 1) {
         emits("confirm", radionum.value);
     } else {
@@ -311,11 +286,6 @@ const userclick = () => {
 
 }
 
-
-
-
-
-
 defineExpose({
     open,
     userclick
diff --git a/src/components/renyuan/index.vue b/src/components/renyuan/index.vue
deleted file mode 100644
index bdf0b35..0000000
--- a/src/components/renyuan/index.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none" 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>
-                    <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" @cell-click="handleCurrentChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="客户名称" prop="customer_id" show-overflow-tooltip />
-                    <el-table-column label="审批id" prop="approve_id" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-
-                    <el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
-                    <el-table-column label="合同类型" prop="contract_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.contract_type" :value="row.contract_type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="合同计价方式" prop="contract_pricing_method">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.contract_pricing_method" :value="row.contract_pricing_method" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="甲方" prop="party_a" show-overflow-tooltip />
-                    <el-table-column label="乙方" prop="party_b" show-overflow-tooltip />
-                    <el-table-column label="金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="业务负责人" prop="business_director" show-overflow-tooltip />
-                    <el-table-column label="合同状态" prop="contract_status" show-overflow-tooltip />
-                    <el-table-column label="合同有效期" prop="expire" show-overflow-tooltip />
-                    <el-table-column label="签约日期" prop="contract_date" show-overflow-tooltip />
-                </el-table>
-
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-</template>
-  
-<script lang="ts" setup>
-import { usePaging } from "@/hooks/usePaging"
-import { useDictData } from "@/hooks/useDictOptions"
-import { apiContractLists } from '@/api/contract'
-
-import { defineEmits } from "vue"
-import { timeFormat } from '@/utils/util'
-
-// 查询条件
-const queryParams = reactive({
-    custom_name: '',
-    project_type: ""
-});
-const { dictData } = useDictData('contract_type,contract_pricing_method')
-
-// 选中数据
-const emits = defineEmits(["customEvent"]);
-
-// 选中数据子父传递
-const handleCurrentChange = (value: any) => {
-    emits("customEvent", value);
-};
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiContractLists,
-    params: queryParams,
-
-});
-
-getLists();
-</script>
\ No newline at end of file
diff --git a/src/views/InvoicingRequests/edit.vue b/src/views/InvoicingRequests/edit.vue
index 0b4e044..6a2c82a 100644
--- a/src/views/InvoicingRequests/edit.vue
+++ b/src/views/InvoicingRequests/edit.vue
@@ -1,226 +1,224 @@
 <template>
     <div class="edit-popup">
-
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-
+            <!-- <flowProcess></flowProcess> -->
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
-                <el-row :gutter="10">
+                <el-card>
+                    <template #header>
+                        <div class="card-header">
+                            <span>基本信息</span>
+                        </div>
+                    </template>
+                    <el-row :gutter="10">
+                        <el-col :span="8">
+                            <el-form-item label="合同编号" prop="contract_id" @click="showDialog1 = true"
+                                :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                                <el-input v-model="contract_no" clearable readonly placeholder="请选择合同" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="合同名称" prop="contract_id">
+                                <el-input v-model="contract_name" clearable disabled placeholder="系统自动填写" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="项目名称" prop="contract_id">
+                                <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
+                            </el-form-item>
+                        </el-col> <el-col :span="8">
+                            <el-form-item label="项目编码" prop="contract_id">
+                                <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="客户名称" prop="contract_id">
+                                <el-input v-model="custom_name" clearable disabled placeholder="系统自动填写" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="开票日期" prop="invoicing_date"
+                                :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                                <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" 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="contract_id" @click="showDialog1 = true"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="contract_no" clearable readonly placeholder="请选择合同" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="合同名称" prop="contract_id">
-                            <el-input v-model="contract_name" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目名称" prop="contract_id">
-                            <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col> <el-col :span="8">
-                        <el-form-item label="项目编码" prop="contract_id">
-                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="客户名称" prop="contract_id">
-                            <el-input v-model="custom_name" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="开票日期" prop="invoicing_date"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                        <el-col :span="8">
+                            <el-form-item label="合同金额" prop="project_amount">
+                                <el-input v-model="project_amount" clearable disabled placeholder="系统自动填写" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="期次" prop="period"
+                                :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                                <el-select class="flex-1" v-model="formData.period" clearable placeholder="请选择期次">
+                                    <el-option v-for="(item, index) in dictData.pay_period" :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="tax_rate">
 
-                            <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="选择开票日期">
-                            </el-date-picker>
+                                <el-select class="flex-1" v-model="formData.tax_rate" clearable placeholder="请选择税率">
+                                    <el-option v-for="(item, index) in dictData.tax_rate" :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="contacts">
+                                <el-select class="flex-1" v-model="formData.invoice_type" clearable placeholder="请选择发票类型">
+                                    <el-option v-for="(item, index) in dictData.invoice_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="invoicing_amount">
+                                <el-input v-model="formData.invoicing_amount" clearable placeholder="请输入开票金额(含税)"
+                                    @change="amountinput" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="金额大写" prop="invoicing_amount_daxie">
+                                <el-input v-model="invoicing_amount_daxie" disabled clearable placeholder="请输入金额大写" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="开票内容" prop="content">
+                                <el-input v-model="formData.content" type="textarea" clearable placeholder="请输入开票内容" />
+                            </el-form-item>
+                        </el-col>
 
-                        </el-form-item>
-                    </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="发票编号" prop="invoice_no">
+                                <el-input v-model="formData.invoice_no" clearable placeholder="请输入发票编号" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="备注" prop="remark">
+                                <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="附件" prop="field127">
+                                <el-upload
+                                    accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
+                                    class="upload-demo" :show-file-list="false" aria-hidden="true"
+                                    :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
+                                    :on-success="handleAvatarSuccess_four" ref="upload">
+                                    <el-button type="primary">
+                                        上传
+                                    </el-button>
+                                </el-upload>
 
-                    <el-col :span="8">
-                        <el-form-item label="合同金额" prop="project_amount">
-                            <el-input v-model="project_amount" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="期次" prop="period"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
-                            <el-select class="flex-1" v-model="formData.period" clearable placeholder="请选择期次">
-                                <el-option v-for="(item, index) in dictData.pay_period" :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="accumulate_amount">
-                            <el-input v-model="accumulate_amount" clearable placeholder="请输入累计开票金额" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="累计回款金额" prop="accumulated_payments_received">
-                            <el-input v-model="accumulated_payments_received" clearable placeholder="请输入累计回款金额" />
-                        </el-form-item>
-                    </el-col> -->
-                    <el-col :span="8">
-                        <el-form-item label="税率" prop="tax_rate">
-
-                            <el-select class="flex-1" v-model="formData.tax_rate" clearable placeholder="请选择税率">
-                                <el-option v-for="(item, index) in dictData.tax_rate" :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="contacts">
-                            <el-select class="flex-1" v-model="formData.invoice_type" clearable placeholder="请选择发票类型">
-                                <el-option v-for="(item, index) in dictData.invoice_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="invoicing_amount">
-                            <el-input v-model="formData.invoicing_amount" clearable placeholder="请输入开票金额(含税)"
-                                @change="amountinput" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="金额大写" prop="invoicing_amount_daxie">
-                            <el-input v-model="invoicing_amount_daxie" disabled clearable placeholder="请输入金额大写" />
-                        </el-form-item>
-                    </el-col>
-                    <!-- <el-col :span="8">
-                        <el-form-item label="开票金额(税额)" prop="tax">
-                            <el-input v-model="formData.tax" clearable placeholder="请输入开票金额(税额)" />
-                        </el-form-item>
-                    </el-col> -->
-                    <!-- <el-col :span="8">
-                        <el-form-item label="开票金额(非税)" prop="amount_including_tax">
-                            <el-input v-model="formData.amount_including_tax" clearable placeholder="请输入开票金额(非税)" />
-                        </el-form-item>
-                    </el-col> -->
-
-
-                    <el-col :span="24">
-                        <el-form-item label="开票内容" prop="content">
-                            <el-input v-model="formData.content" type="textarea" clearable placeholder="请输入开票内容" />
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item label="发票编号" prop="invoice_no">
-                            <el-input v-model="formData.invoice_no" clearable placeholder="请输入发票编号" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="备注" prop="remark">
-                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <!-- <el-form-item label="附件" prop="annex">
-                            <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                        </el-form-item> -->
-                        <el-form-item label="附件" prop="field127">
-                            <el-upload
-                                accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-                                class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
-                                :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-
-                            <div>
-                                <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                        target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+                                <div>
+                                    <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
+                                            :href="item.uri" target="_blank">{{ item.name }}</a>
+                                        <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+                                    </div>
                                 </div>
-                            </div>
 
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <div style="margin: 20px 0;">客户开票信息</div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
 
-                <el-row :gutter="10">
+                </el-card>
 
-                    <el-col :span="8">
-                        <el-form-item label="开票公司名称" prop="invoicing_company_name">
-                            <el-input v-model="formData.invoicing_company_name" clearable placeholder="请输入开票公司名称" />
-                        </el-form-item>
 
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="纳税人识别号" prop="taxpayer_identification_number">
-                            <el-input v-model="formData.taxpayer_identification_number" clearable placeholder="请输入纳税人识别号" />
-                        </el-form-item>
 
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="开户银行" prop="deposit_bank">
-                            <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
-                        </el-form-item>
+                <el-card>
+                    <template #header>
+                        <div class="card-header">
+                            <span>客户开票信息</span>
+                        </div>
+                    </template>
+                    <el-row :gutter="10">
 
-                    </el-col> <el-col :span="8">
-                        <el-form-item label="账号" prop="bank_accnout">
-                            <el-input v-model="formData.bank_accnout" clearable placeholder="请输入开票公司名称" />
-                        </el-form-item>
+                        <el-col :span="8">
+                            <el-form-item label="开票公司名称" prop="invoicing_company_name">
+                                <el-input v-model="formData.invoicing_company_name" clearable placeholder="请输入开票公司名称" />
+                            </el-form-item>
 
-                    </el-col> <el-col :span="8">
-                        <el-form-item label="开户地址及电话" prop="address_phone">
-                            <el-input v-model="formData.address_phone" clearable placeholder="请输入开户地址及电话" />
-                        </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="纳税人识别号" prop="taxpayer_identification_number">
+                                <el-input v-model="formData.taxpayer_identification_number" clearable
+                                    placeholder="请输入纳税人识别号" />
+                            </el-form-item>
 
-                    </el-col>
-                </el-row>
-                <div style="margin: 20px 0;">发票邮寄信息</div>
-                <el-row :gutter="10">
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="开户银行" prop="deposit_bank">
+                                <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
+                            </el-form-item>
 
-                    <el-col :span="8">
-                        <el-form-item label="收票地址" prop="receiving_address">
-                            <el-input v-model="formData.receiving_address" clearable placeholder="请输入收票地址" />
-                        </el-form-item>
+                        </el-col> <el-col :span="8">
+                            <el-form-item label="账号" prop="bank_accnout">
+                                <el-input v-model="formData.bank_accnout" clearable placeholder="请输入开票公司名称" />
+                            </el-form-item>
 
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="联系人" prop="contacts">
-                            <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
-                        </el-form-item>
+                        </el-col> <el-col :span="8">
+                            <el-form-item label="开户地址及电话" prop="address_phone">
+                                <el-input v-model="formData.address_phone" clearable placeholder="请输入开户地址及电话" />
+                            </el-form-item>
 
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="联系电话" prop="phone" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
-                            <el-input v-model="formData.phone" clearable placeholder="请输入联系电话" />
-                        </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+                <el-card>
+                    <template #header>
+                        <div class="card-header">
+                            <span>发票邮寄信息</span>
+                        </div>
+                    </template>
+                    <el-row :gutter="10">
+                        <el-col :span="8">
+                            <el-form-item label="收票地址" prop="receiving_address">
+                                <el-input v-model="formData.receiving_address" clearable placeholder="请输入收票地址" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="联系人" prop="contacts">
+                                <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="联系电话" prop="phone" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
+                                <el-input v-model="formData.phone" clearable placeholder="请输入联系电话" />
+                            </el-form-item>
+                        </el-col> <el-col :span="8">
+                            <el-form-item label="邮寄时间" prop="mailing_time">
+                                <el-date-picker class="flex-1 !flex" v-model="formData.mailing_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="mailing_type">
+                                <el-input v-model="formData.mailing_type" clearable placeholder="请输入邮寄方式" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="邮寄单号" prop="mailing_no">
+                                <el-input v-model="formData.mailing_no" clearable placeholder="请输入邮寄单号" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
 
-                    </el-col> <el-col :span="8">
-                        <el-form-item label="邮寄时间" prop="mailing_time">
+                <el-card>
+                    <template #header>
+                        <div class="card-header">
+                            <span>审批流程</span>
+                        </div>
+                    </template>
+                    <FlowProcess></FlowProcess>
+                </el-card>
 
-                            <el-date-picker class="flex-1 !flex" v-model="formData.mailing_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="mailing_type">
-                            <el-input v-model="formData.mailing_type" clearable placeholder="请输入邮寄方式" />
-                        </el-form-item>
-
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="邮寄单号" prop="mailing_no">
-                            <el-input v-model="formData.mailing_no" clearable placeholder="请输入邮寄单号" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
                 <el-dialog v-model="showDialog" title="选择客户" width="70%">
                     <customDialog @customEvent="customEvent"></customDialog>
                 </el-dialog>
@@ -240,16 +238,11 @@ import Popup from '@/components/popup/index.vue'
 import { toChinesNum } from "@/utils/util";
 import contractDialog from '@/components/contract/index.vue'
 import { apiinvoiceapplyAdd, apiinvoiceapplyEdit, apiinvoiceapplyDetail } from '@/api/InvoicingRequests'
-import { getAllProjectTypes } from '@/api/projecttype'
-import { timeFormat } from '@/utils/util'
-import { isEmail, isIdCard, isPhone } from '@/utils/validate'
-import type { PropType } from 'vue'
 import configs from "@/config"
 import useUserStore from "@/stores/modules/user";
 import { computed } from "vue"
 import { useDictData } from '@/hooks/useDictOptions'
 const { dictData } = useDictData('pay_period,invoice_type,tax_rate')
-
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
 const active = ref(0)
diff --git a/src/views/bid_bidding_decision/edit.vue b/src/views/bid_bidding_decision/edit.vue
index 9994599..9bdc4c0 100644
--- a/src/views/bid_bidding_decision/edit.vue
+++ b/src/views/bid_bidding_decision/edit.vue
@@ -133,7 +133,6 @@
 <script lang="ts" setup name="bidBiddingDecisionEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import reviewprocess from '@/components/reviewprocess/index.vue'
 import projectTable from "@/components/project/index.vue"
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiBidBiddingDecisionAdd, apiBidBiddingDecisionDetail, apiBidBiddingDecisionEdit } from '@/api/bid_bidding_decision'
diff --git a/src/views/organization/department/edit.vue b/src/views/organization/department/edit.vue
index 602659a..96964c8 100644
--- a/src/views/organization/department/edit.vue
+++ b/src/views/organization/department/edit.vue
@@ -2,21 +2,17 @@
     <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="org_id">
-                    <el-select clearable v-model="formData.org_id" placeholder="请选择组织" @change="area_change">
+                    <el-select clearable v-model="formData.org_id" placeholder="请选择组织" @change="area_change" class="flex-1">
                         <el-option v-for="(item, index) in orglist" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="部门名称" prop="name">
-                    <!-- <el-select clearable v-model="formData.name" placeholder="请选择部门" @change="area_change1">
-                        <el-option v-for="(item, index) in jobs" :key="index" :label="item.name" :value="item.id" />
-                    </el-select> -->
-                    <el-input class="w-[280px]" v-model="formData.name" clearable @keyup.enter="getLists" />
+                    <el-input v-model="formData.name" clearable placeholder="请输入部门名称" />
                 </el-form-item>
-
                 <el-form-item label="负责人" prop="leader">
-                    <el-input v-model="formData.leader" placeholder="请输入负责人姓名" :maxlength="30" />
+                    <el-input v-model="formData.leader_name" readonly placeholder="请输入负责人姓名" :maxlength="30"
+                        @click="openDialog" />
                 </el-form-item>
                 <el-form-item label="联系电话" prop="mobile">
                     <el-input v-model="formData.mobile" placeholder="请输入联系电话" />
@@ -32,19 +28,24 @@
                 </el-form-item>
             </el-form>
         </popup>
+        <personnelSelector v-if="showDiolg" ref="personnel" type="1" @confirm="submituser" />
+
     </div>
 </template>
 <script lang="ts" setup>
 import type { FormInstance } from 'element-plus'
 import { deptEdit, deptAdd, deptDetail, deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
-import Popup from '@/components/popup/index.vue'
+import personnelSelector from "@/components/personnelselector/index.vue"
+import { nextTick } from 'vue'
 
-import { useDictOptions } from '@/hooks/useDictOptions'
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDiolg = ref(false)
+const personnel = ref(null)
+
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑部门' : '新增部门'
 })
@@ -53,11 +54,26 @@ const formData = reactive({
     org_id: '' as string | number,
     name: '',
     leader: '',
+    leader_name: '',
     mobile: '',
     status: 1,
     sort: ''
 })
-const name = ref('')
+
+const submituser = (e) => {
+    console.log(e)
+    formData.leader = e.id
+    formData.leader_name = e.name
+    showDiolg.value = false
+}
+
+const openDialog = async () => {
+    showDiolg.value = true
+    await nextTick()
+    personnel.value?.open()
+}
+
+
 const orglist = reactive([])
 
 const jobs = reactive([])
@@ -111,16 +127,7 @@ const area_change = (e: any) => {
 
     })
 }
-const area_change1 = (e: any) => {
-    // formData.org_id = e
-    console.log(e, jobs.find((item) => { item.id == e }))
-    const name = jobs.map(obj => obj.id === e ? obj.name : null).find(value => value !== null);
-    formData.name = name
-    // console.log(name)
-    // jobs.map((item)=>{item.id==e})
 
-
-}
 const handleSubmit = async () => {
     await formRef.value?.validate()
     mode.value == 'edit' ? await deptEdit(formData) : await deptAdd(formData)
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index b4d31e2..6c0bbd9 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -122,7 +122,6 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiProjectLists, apiProjectDelete, apiProjectDetail } from '@/api/project'
-import { timeFormat } from '@/utils/util'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
 import feedback from '@/utils/feedback'