lagos
|
73634e78ec
|
1.新增计划审核
|
2025-07-24 17:23:59 +08:00 |
|
lagos
|
b1bb4553b5
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# env/.env.development
|
2025-07-24 11:09:53 +08:00 |
|
lagos
|
e63262c2da
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# env/.env.development
|
2025-07-24 11:05:53 +08:00 |
|
yangzhq68909
|
8c08c1f3df
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-07-24 11:02:11 +08:00 |
|
yangzhq68909
|
65ac3e6830
|
请销假修改，可显示全部劳资员
|
2025-07-24 11:01:55 +08:00 |
|
张 祥瑞
|
4543e9d5d1
|
Merge branch 'zxrapp' into 'master'
7.24张祥瑞
See merge request cxcxt/jeecguniapp!29
|
2025-07-24 09:39:10 +08:00 |
|
张祥瑞
|
7e9629c4dd
|
7.24张祥瑞
|
2025-07-24 09:39:14 +08:00 |
|
yangzhq68909
|
72420dea52
|
请销假劳资员获取修改，显示全部劳资员，默认显示本单位劳资员
|
2025-07-23 15:30:51 +08:00 |
|
张 祥瑞
|
b47831e2db
|
Merge branch 'zxrapp' into 'master'
7.21张祥瑞
See merge request cxcxt/jeecguniapp!28
|
2025-07-21 10:50:59 +08:00 |
|
张祥瑞
|
8a8fe98ec3
|
7.21张祥瑞
|
2025-07-21 10:50:34 +08:00 |
|
张 祥瑞
|
8f0e1585b2
|
Merge branch 'zxrapp' into 'master'
Zxrapp
See merge request cxcxt/jeecguniapp!27
|
2025-07-18 17:26:53 +08:00 |
|
张祥瑞
|
7e7156bbc4
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-07-18 17:26:37 +08:00 |
|
张祥瑞
|
745e046bf3
|
7.18zxr
|
2025-07-18 17:26:18 +08:00 |
|
yangzhq68909
|
512a83984b
|
请假单位判断修改
|
2025-07-11 08:54:55 +08:00 |
|
lagos
|
1a2752d972
|
1
|
2025-07-04 14:12:32 +08:00 |
|
lagos
|
72cae1ec15
|
1.修改
|
2025-06-30 10:15:12 +08:00 |
|
yangzhq68909
|
8dd460b322
|
1
|
2025-06-27 17:58:10 +08:00 |
|
张 祥瑞
|
bd4582b966
|
Merge branch 'zxrapp' into 'master'
6.27张祥瑞
See merge request cxcxt/jeecguniapp!26
|
2025-06-27 15:15:50 +08:00 |
|
张祥瑞
|
43c8a5f5b2
|
6.27张祥瑞
|
2025-06-27 15:15:15 +08:00 |
|
张 祥瑞
|
915580cfe0
|
Merge branch 'zxrapp' into 'master'
6.27张祥瑞
See merge request cxcxt/jeecguniapp!25
|
2025-06-27 14:55:51 +08:00 |
|
张祥瑞
|
1e1901147f
|
6.27张祥瑞
|
2025-06-27 14:55:07 +08:00 |
|
闵 年泽
|
94cf09e0e1
|
Merge branch 'minJeecg' into 'master'
1.修改健康随访
See merge request cxcxt/jeecguniapp!24
|
2025-06-27 09:17:53 +08:00 |
|
lagos
|
df6de11a0b
|
1.修改健康随访
|
2025-06-27 09:17:22 +08:00 |
|
闵 年泽
|
d64a000465
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!23
|
2025-06-27 08:37:12 +08:00 |
|
lagos
|
e852e1e997
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# manifest.config.ts
# src/manifest.json
|
2025-06-27 08:36:52 +08:00 |
|
lagos
|
157e5d294f
|
1.
|
2025-06-27 08:35:52 +08:00 |
|
yangzhq68909
|
c2ba2ba883
|
2.1.0 20250627
|
2025-06-27 08:29:15 +08:00 |
|
yangzhq68909
|
ac08c06a7e
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-27 08:18:37 +08:00 |
|
yangzhq68909
|
5eaac7320f
|
1
|
2025-06-27 08:18:24 +08:00 |
|
张 祥瑞
|
44c7f80124
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!22
|
2025-06-26 18:12:16 +08:00 |
|
张祥瑞
|
485978e0ed
|
6.26张祥瑞
|
2025-06-26 18:11:22 +08:00 |
|
张 祥瑞
|
70c3d23377
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!21
|
2025-06-26 16:51:26 +08:00 |
|
张祥瑞
|
e7f6f84790
|
6.26张祥瑞
|
2025-06-26 16:50:26 +08:00 |
|
yangzhq68909
|
d426f201d8
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-26 16:24:11 +08:00 |
|
yangzhq68909
|
2e8de0d60a
|
6.26
|
2025-06-26 16:22:49 +08:00 |
|
张 祥瑞
|
71c1f0812f
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!20
|
2025-06-26 16:18:37 +08:00 |
|
张祥瑞
|
dddcccc6cd
|
6.26张祥瑞
|
2025-06-26 16:17:53 +08:00 |
|
yangzhq68909
|
d2946c938a
|
1
|
2025-06-26 10:38:28 +08:00 |
|
张 祥瑞
|
22ff10e012
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!19
|
2025-06-26 10:13:57 +08:00 |
|
张祥瑞
|
cd340d4185
|
6.26张祥瑞
|
2025-06-26 10:13:23 +08:00 |
|
张 祥瑞
|
72c98dba18
|
Merge branch 'zxrapp' into 'master'
Zxrapp
See merge request cxcxt/jeecguniapp!18
|
2025-06-26 09:28:46 +08:00 |
|
张祥瑞
|
58e1b25208
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-26 09:16:35 +08:00 |
|
张祥瑞
|
c979a59072
|
6.26张祥瑞
|
2025-06-26 08:38:28 +08:00 |
|
yangzhq68909
|
8ce1ebbe96
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-25 09:19:06 +08:00 |
|
yangzhq68909
|
3e4b0c1da9
|
1
|
2025-06-25 09:11:52 +08:00 |
|
yangzhq68909
|
3691d5d90f
|
健康随访表单提交
|
2025-06-25 09:07:54 +08:00 |
|
张 祥瑞
|
e1380803a5
|
Merge branch 'zxrapp' into 'master'
6.24张祥瑞
See merge request cxcxt/jeecguniapp!17
|
2025-06-24 16:53:46 +08:00 |
|
张祥瑞
|
0c5543ae73
|
6.24张祥瑞
|
2025-06-24 16:51:53 +08:00 |
|
张 祥瑞
|
9bc0f8da15
|
Merge branch 'zxrapp' into 'master'
Zxrapp
See merge request cxcxt/jeecguniapp!16
|
2025-06-23 16:28:37 +08:00 |
|
张祥瑞
|
c278e4618a
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.development
# src/pages-process/components/DynamicLink.vue
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-23 16:27:22 +08:00 |
|