yangzhq68909
|
2654c81e70
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.production
|
2025-06-03 17:15:43 +08:00 |
|
yangzhq68909
|
d5e6a4dd26
|
2.0.0 修复h5证书问题
|
2025-06-03 17:13:19 +08:00 |
|
闵 年泽
|
7848276b4d
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!11
|
2025-05-30 17:50:52 +08:00 |
|
lagos
|
0b0836a91b
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# src/pages/login/login.vue
|
2025-05-30 17:34:38 +08:00 |
|
lagos
|
f8106c9a68
|
1.修改模块
|
2025-05-30 17:34:09 +08:00 |
|
yangzhq68909
|
12a80014a0
|
1.登录页提示 2.流程图显示修改
|
2025-05-30 16:31:08 +08:00 |
|
yangzhq68909
|
55d27e7f90
|
2.0.0
|
2025-05-30 08:30:31 +08:00 |
|
yangzhq68909
|
88962d4dbd
|
1.修改水印 2.修改三册在线预览
|
2025-05-29 18:25:16 +08:00 |
|
yangzhq68909
|
23ff8c1d65
|
2.0.0
|
2025-05-29 10:11:21 +08:00 |
|
yangzhq68909
|
4cfa4e2af1
|
2.0
|
2025-05-29 10:07:09 +08:00 |
|
yangzhq68909
|
6f4b3386d9
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/api/process/index.ts
# src/pages-process/taskHandle.vue
|
2025-05-28 15:05:00 +08:00 |
|
yangzhq68909
|
77c86f3a8f
|
领导审批不同意后短信通知
|
2025-05-28 14:52:04 +08:00 |
|
闵 年泽
|
e609bdd5b5
|
Merge branch 'minJeecg' into 'master'
1.修改模块
See merge request cxcxt/jeecguniapp!10
|
2025-05-28 14:51:38 +08:00 |
|
lagos
|
83ec561bcb
|
1.修改模块
|
2025-05-28 14:51:02 +08:00 |
|
yangzhq68909
|
3cefc4add1
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/pages-process/components/taskDeal.vue
|
2025-05-27 18:13:30 +08:00 |
|
yangzhq68909
|
df5ed2843e
|
1
|
2025-05-27 18:12:30 +08:00 |
|
闵 年泽
|
b685f82d84
|
Merge branch 'minJeecg' into 'master'
1.修改流程
See merge request cxcxt/jeecguniapp!9
|
2025-05-27 18:12:03 +08:00 |
|
lagos
|
fcc9a07681
|
1.修改流程
|
2025-05-27 18:11:28 +08:00 |
|
闵 年泽
|
229d52db47
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!8
|
2025-05-27 17:32:53 +08:00 |
|
lagos
|
ca6c08b8c6
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# src/api/process/index.ts
|
2025-05-27 17:32:23 +08:00 |
|
lagos
|
c5edb1ef5a
|
1.添加历史任务
|
2025-05-27 17:31:39 +08:00 |
|
yangzhq68909
|
63a564a391
|
取回流程
|
2025-05-27 17:03:21 +08:00 |
|
yangzhq68909
|
401101ddd2
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/api/process/index.ts
|
2025-05-27 14:53:55 +08:00 |
|
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 |
|