Commit Graph

4064 Commits (5591ad024053bc2919b77c9409407bfca1951f9a)

Author SHA1 Message Date
wangzhen 5591ad0240 增加本地后端地址 2025-05-24 17:13:27 +08:00
wangzhen 4bb12b8314 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa
# Conflicts:
#	.env.local
2025-05-24 15:50:49 +08:00
wangzhen 4b00cc2e41 增加本地后端地址 2025-05-24 15:46:41 +08:00
zy 3480d6604c 客户-联系人 2025-05-24 12:48:53 +08:00
zy 36589b2910 获取标签 2025-05-23 17:07:22 +08:00
zy 8778919237 权限 2025-05-23 17:03:03 +08:00
zy b60a441014 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-23 10:18:39 +08:00
zy 39e49121e2 组件相关-hrm 2025-05-23 10:18:35 +08:00
quu 65c88a24ef Merge branch 'master' into wkz 2025-05-22 21:23:36 +09:00
quu f4eac55974 hrm 2025-05-22 21:10:00 +09:00
苑坤 011739879b 修改页面 2025-05-21 12:32:08 +08:00
苑坤 747f4e9926 修改页面 2025-05-21 12:22:00 +08:00
zy ed09002861 放出字段 2025-05-20 13:32:06 +08:00
zy d921d0f5c0 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-20 09:49:13 +08:00
zy 23e802cff3 组件问题 2025-05-20 09:49:09 +08:00
quu 6ea980d2b2 hrm 2025-05-19 22:28:27 +09:00
zy 990223ec34 问题处理 2025-05-19 19:02:17 +08:00
zy 4d78cc06f2 师徒 2025-05-19 16:21:23 +08:00
zy 8a6758ba60 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-19 15:45:10 +08:00
zy fda9b655fb 客户 2025-05-19 15:45:05 +08:00
wangzhen e8435e6449 建会申请初始化 2025-05-19 15:22:55 +08:00
zy 185b306240 客户组件封装 2025-05-19 12:31:14 +08:00
quu a98497cf47 Merge branch 'master' into wkz 2025-05-18 12:03:25 +09:00
quu db45cc6cbd hrm 2025-05-18 12:03:09 +09:00
zy 0692c4f9dd Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-17 17:40:52 +08:00
zy a3e714aad9 数据权限 2025-05-17 17:40:48 +08:00
quu 8c74752b2b Merge branch 'wkz' 2025-05-17 17:17:31 +09:00
quu 0580b9876e hrm 2025-05-16 21:26:16 +09:00
quu 172f9a5dcd Merge branch 'master' into wkz
# Conflicts:
#	src/views/crm/contract/index.vue
2025-05-16 20:13:49 +09:00
zy bd50c3fc95 懒加载 2025-05-16 13:53:34 +08:00
zy f99a823ca9 新建任务 2025-05-15 16:42:12 +08:00
zy 4804d4e146 项目 2025-05-15 15:32:15 +08:00
zy dd2242e2be 文件上传 2025-05-15 10:30:56 +08:00
zy 0ea5bb7d9b Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-14 22:10:12 +08:00
zy 060ec1f1b3 月报 2025-05-14 22:10:07 +08:00
苑坤 15b84bd98e 修改商机相关内容 2025-05-14 17:51:26 +08:00
zy 7049674d1e Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-14 14:36:22 +08:00
zy 6808e58381 日报-周报 2025-05-14 14:36:18 +08:00
wangzhen 3570155224 增加服务费收取方式模块 2025-05-14 12:04:00 +08:00
quu 2459e24213 HRM 员工福利 2025-05-13 10:08:44 +09:00
苑坤 a8be52c84b 项目难度管理功能 2025-05-12 23:56:39 +08:00
苑坤 e497e9f856 技术对接清单管理功能 2025-05-12 23:38:05 +08:00
苑坤 fc7b9ce6da Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/utils/dict.ts
2025-05-12 23:34:00 +08:00
苑坤 4a8788f420 技术对接清单管理功能 2025-05-12 23:33:14 +08:00
zy 0805d1b9d7 线上申请 2025-05-12 22:34:29 +08:00
zy 1aa9884af7 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-12 21:57:49 +08:00
zy a963bdef6f 上线申请 2025-05-12 21:57:45 +08:00
苑坤 b16be8f7fb 修改线上、线下显示名称 2025-05-12 18:03:27 +08:00
zy 1dda82a081 项目 2025-05-12 15:49:29 +08:00
zy 4c9618bc29 合同变更 2025-05-12 15:06:45 +08:00