lagos
|
cab2794040
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
|
2025-09-17 14:56:06 +08:00 |
|
lagos
|
74c0d48277
|
1.ofice
|
2025-09-17 14:55:44 +08:00 |
|
|
|
6c94acbe61
|
完成历史日报数据查询和曲线生成
|
2025-09-16 17:15:33 +08:00 |
|
|
|
7121f317b6
|
修改完善多曲线组件
完成实时采集页面瞬时流量点击查询五分钟存盘数据的历史趋势功能
|
2025-09-16 10:44:36 +08:00 |
|
|
|
6bac6dc89d
|
修改生产模块页面，增加顶部标签，新建分包pages-production，将生产页面移动至分包下面。
下一步制作曲线页面，统计页面，继续做好设备，安防等页面。
|
2025-09-15 17:50:48 +08:00 |
|
yangzhq68909
|
cf7c21a160
|
增加临时劳务登录
|
2025-09-08 13:27:49 +08:00 |
|
yangzhq68909
|
c97b130da9
|
app登录方式修改 增加劳动合同号
|
2025-09-03 15:17:38 +08:00 |
|
张祥瑞
|
d5ff310858
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-08-05 15:04:19 +08:00 |
|
张祥瑞
|
286dade1e2
|
0805张祥瑞
|
2025-08-05 15:03:47 +08:00 |
|
lagos
|
5a3a62dd45
|
1.修改公务接待APP
|
2025-07-25 17:21:01 +08:00 |
|
lagos
|
73634e78ec
|
1.新增计划审核
|
2025-07-24 17:23:59 +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 |
|
张祥瑞
|
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
|
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
|
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 |
|
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 |
|
lagos
|
83ec561bcb
|
1.修改模块
|
2025-05-28 14:51:02 +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 |
|
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 |
|
yangzhq68909
|
15e356b2ce
|
请假修改
|
2025-05-23 18:09:19 +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 |
|
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 |
|
lagos
|
3a70bf820d
|
1.修改页面
|
2025-05-19 10:13:01 +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 |
|
