Commit Graph

116 Commits

Author SHA1 Message Date
yangzhq68909
d133b539c4 1 2025-07-28 09:51:19 +08:00
yangzhq68909
a99fe816c1 Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
#	env/.env.development
2025-07-25 17:03:06 +08:00
yangzhq68909
16877fbf17 1 2025-07-25 17:02:39 +08:00
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
张祥瑞
7e9629c4dd 7.24张祥瑞 2025-07-24 09:39:14 +08:00
yangzhq68909
72420dea52 请销假劳资员获取修改,显示全部劳资员,默认显示本单位劳资员 2025-07-23 15:30:51 +08:00
张祥瑞
8a8fe98ec3 7.21张祥瑞 2025-07-21 10:50:34 +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
张祥瑞
43c8a5f5b2 6.27张祥瑞 2025-06-27 15:15:15 +08:00
张祥瑞
1e1901147f 6.27张祥瑞 2025-06-27 14:55:07 +08:00
lagos
df6de11a0b 1.修改健康随访 2025-06-27 09:17:22 +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
张祥瑞
485978e0ed 6.26张祥瑞 2025-06-26 18:11:22 +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
张祥瑞
dddcccc6cd 6.26张祥瑞 2025-06-26 16:17:53 +08:00
张祥瑞
cd340d4185 6.26张祥瑞 2025-06-26 10:13:23 +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
张祥瑞
0c5543ae73 6.24张祥瑞 2025-06-24 16:51:53 +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
张祥瑞
928959dfe0 6.23张祥瑞,添加制度及法律法规的审批页面 2025-06-23 16:19:05 +08:00
yangzhq68909
5726688c2e 1 2025-06-23 08:38:09 +08:00
yangzhq68909
72938d6407 三册修改 2025-06-20 10:51:47 +08:00
yangzhq68909
56427dbb19 Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
#	env/.env.development
2025-06-19 17:40:15 +08:00
yangzhq68909
2175a82f6c 1.流程审批页面增加考核实施、指标考核 2025-06-19 17:38:54 +08:00
lagos
71b3470ca2 1.修改app机制 2025-06-17 17:34:45 +08:00
yangzhq68909
3801233bf0 Merge remote-tracking branch 'remotes/origin/master' 2025-06-16 16:17:45 +08:00
yangzhq68909
b535e5ad3c 修改判断是否有新版本方法 2025-06-16 16:17:33 +08:00
lagos
be8ca7445e 1.修改模块 2025-06-16 11:35:05 +08:00
yangzhq68909
b4b88b0cd7 2.0.2 2025-06-15 10:44:00 +08:00
yangzhq68909
c5d9e0c8b9 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-13 17:27:45 +08:00
yangzhq68909
dab30417bd 请假、干租车、公文发布 2025-06-13 16:27:09 +08:00
lagos
2d6bb85936 1.新增非常规模块 2025-06-12 12:34:30 +08:00
yangzhq68909
a6d16819e1 干租车审批页面 2025-06-09 16:04:21 +08:00