Commit Graph

31 Commits

Author SHA1 Message Date
张祥瑞
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
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
2175a82f6c 1.流程审批页面增加考核实施、指标考核 2025-06-19 17:38:54 +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
jiang
25cbc74830 实流检定,脱离登录。 2025-06-09 08:23:21 +08:00
yangzhq68909
63a564a391 取回流程 2025-05-27 17:03:21 +08:00
yangzhq68909
0aafb0d04a 1.审批角标 2.请假审批历史查询 2025-05-27 11:35:28 +08:00
lagos
02eea62af0 1.修改流程 2025-05-26 15:00:08 +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
5ae2c91ac1 健康填报 2025-05-19 15:23:48 +08:00
yangzhq68909
f397dc0f5f 分包处理 2025-05-19 09:52:19 +08:00
yangzhq68909
096fa96eb7 Merge remote-tracking branch 'remotes/origin/master' 2025-05-16 15:06:37 +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
cfe8db7730 jeecguniapp1.0 2025-04-29 16:37:17 +08:00