Commit Graph

96 Commits

Author SHA1 Message Date
yangzhq68909
f609a4332f 1 2025-05-27 14:53:18 +08:00
闵 年泽
6b75d065c0 Merge branch 'minJeecg' into 'master'
Min jeecg

See merge request cxcxt/jeecguniapp!7
2025-05-27 14:51:48 +08:00
lagos
16ecf59e80 Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
#	src/pages-bpm/leaveApplication/index.vue
#	src/pages-process/components/myTask.vue
2025-05-27 14:51:09 +08:00
lagos
10d30bf332 1.修改流程 2025-05-27 14:49:17 +08:00
yangzhq68909
0aafb0d04a 1.审批角标 2.请假审批历史查询 2025-05-27 11:35:28 +08:00
闵 年泽
61a1034efd Merge branch 'minJeecg' into 'master'
Min jeecg

See merge request cxcxt/jeecguniapp!6
2025-05-26 15:01:00 +08:00
lagos
34659615da Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
#	env/.env.development
2025-05-26 15:00:38 +08:00
lagos
02eea62af0 1.修改流程 2025-05-26 15:00:08 +08:00
yangzhq68909
15e356b2ce 请假修改 2025-05-23 18:09:19 +08:00
yangzhq68909
9038aa4975 Merge remote-tracking branch 'remotes/origin/master' 2025-05-23 17:36:39 +08:00
yangzhq68909
d362629619 1 2025-05-23 17:36:26 +08:00
闵 年泽
2550b4de8d Merge branch 'minJeecg' into 'master'
Min jeecg

See merge request cxcxt/jeecguniapp!5
2025-05-23 09:49:20 +08:00
lagos
39dd44aa98 Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
#	env/.env.development
2025-05-23 09:48:56 +08:00
lagos
8d34d11250 1.修改模块 2025-05-23 09:48:28 +08:00
yangzhq68909
2ee9a1b0d6 生产模块 2025-05-22 15:30:36 +08:00
yangzhq68909
d510a9a734 请假详情 2025-05-20 18:45:08 +08:00
yangzhq68909
3c1c9e9b7f Merge remote-tracking branch 'remotes/origin/master' 2025-05-20 10:29:46 +08:00
yangzhq68909
c657a8e5be 请假信息 2025-05-20 10:29:29 +08:00
闵 年泽
d78e25e5d9 Merge branch 'minJeecg' into 'master'
Min jeecg

See merge request cxcxt/jeecguniapp!4
2025-05-20 10:07:14 +08:00
lagos
40ff07d8c4 Merge remote-tracking branch 'remotes/origin/master' into minJeecg 2025-05-20 10:06:50 +08:00
lagos
ff84dff20c 1.修改部门组件 2025-05-20 10:06:35 +08:00
yangzhq68909
77f45701b8 Merge remote-tracking branch 'remotes/origin/master' 2025-05-19 15:24:04 +08:00
yangzhq68909
5ae2c91ac1 健康填报 2025-05-19 15:23:48 +08:00
闵 年泽
5421bc9c9f Merge branch 'minJeecg' into 'master'
Min jeecg

See merge request cxcxt/jeecguniapp!3
2025-05-19 10:13:46 +08:00
lagos
822c5c5629 Merge remote-tracking branch 'remotes/origin/master' into minJeecg 2025-05-19 10:13:15 +08:00
lagos
3a70bf820d 1.修改页面 2025-05-19 10:13:01 +08:00
yangzhq68909
f397dc0f5f 分包处理 2025-05-19 09:52:19 +08:00
yangzhq68909
5ca961e10e Merge remote-tracking branch 'remotes/origin/master' 2025-05-16 18:04:16 +08:00
yangzhq68909
2c842209fa 请假提交流程 2025-05-16 18:04:04 +08:00
闵 年泽
153de8aa66 Merge branch 'minJeecg' into 'master'
Min jeecg

See merge request cxcxt/jeecguniapp!2
2025-05-16 16:07:33 +08:00
lagos
99435c0610 Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
#	src/api/process/index.ts
#	src/pages/process/approvalTabbar.vue
#	src/pages/process/taskHandle.vue
2025-05-16 16:06:37 +08:00
lagos
c27cc84cfb 1.ixug流程 2025-05-16 16:04:30 +08:00
yangzhq68909
3c54607ab7 优化导航栏 2025-05-16 16:03:56 +08:00
yangzhq68909
096fa96eb7 Merge remote-tracking branch 'remotes/origin/master' 2025-05-16 15:06:37 +08:00
yangzhq68909
09a3a9e182 请假附件上传 2025-05-16 15:06:26 +08:00
闵 年泽
23615be39d Merge branch 'minJeecg' into 'master'
Min jeecg

See merge request cxcxt/jeecguniapp!1
2025-05-16 15:05:58 +08:00
lagos
1adbad009a 1 2025-05-16 15:05:24 +08:00
lagos
acf22e0cfb 1.修改流程 2025-05-16 15:04:50 +08:00
yangzhq68909
3c2dc3ac5e 请假申请 2025-05-16 11:01:27 +08:00
yangzhq68909
ca7bc6bdaa 干部值班 2025-05-14 09:58:47 +08:00
yangzhq68909
3424a06b36 11 2025-05-13 17:17:47 +08:00
yangzhq68909
d9de5ae2de 1.登录时间判断 2.脚手架升级 3.主页显示优化 4.文件列表页面 2025-05-09 18:01:58 +08:00
yangzhq68909
09ce6fbb11 1 2025-05-09 09:42:19 +08:00
yangzhq68909
f0060f0a02 热更新 2025-04-30 09:16:10 +08:00
yangzhq68909
cfe8db7730 jeecguniapp1.0 2025-04-29 16:37:17 +08:00
杨哲琦
bd1d2cd6d2 Initial commit 2025-04-29 16:31:28 +08:00