刘燕峰
|
129db4b787
|
Merge branch 'fanpeng' into 'develop'
feat: 添加审核结果页UI
See merge request StarlockTeam/starwork-uniapp!15
|
2025-08-01 10:39:33 +00:00 |
|
魏少阳
|
f8f65fdb77
|
Merge branch 'develop_wsy' into 'develop'
Develop wsy required merge
See merge request StarlockTeam/starwork-uniapp!16
|
2025-01-24 06:02:18 +00:00 |
|
魏少阳
|
c707b2c8ae
|
fix: 解决冲突
|
2025-01-24 13:58:13 +08:00 |
|
魏少阳
|
237b36a89f
|
Merge branch 'develop' into develop_wsy
# Conflicts:
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-01-24 13:56:05 +08:00 |
|
魏少阳
|
ece4437d7d
|
feat: 1、完成添加权限组UI。2、完成下发权限UI。3、完成下发记录UI。4、添加及节日计划配置UI。5、添加增加时间计划UI
|
2025-01-24 13:50:14 +08:00 |
|
魏少阳
|
216e29873d
|
feat: 添加权限查询模块UI
|
2025-01-22 11:38:52 +08:00 |
|
魏少阳
|
cfa564f458
|
feat: 完成人员通行一级界面
|
2025-01-20 16:42:32 +08:00 |
|
魏少阳
|
ba168f84fa
|
feat: 完成人员通行一级界面
|
2025-01-20 16:42:05 +08:00 |
|
范鹏
|
f854489e89
|
fix: 创建审批UI优化
|
2025-01-20 10:07:36 +08:00 |
|
范鹏
|
3f47f8bffe
|
feat: 添加审核结果页UI
|
2025-01-17 18:35:40 +08:00 |
|
魏少阳
|
347181ed31
|
feat: 添加人员通行模块一键开门、密码开门、访客管理、我的访客、访客设置UI
|
2025-01-17 17:49:55 +08:00 |
|
刘燕峰
|
89b28d0103
|
Merge branch 'fanpeng' into 'develop'
Fanpeng
See merge request StarlockTeam/starwork-uniapp!14
|
2025-01-17 07:56:40 +00:00 |
|
范鹏
|
b5bb914f95
|
Merge remote-tracking branch 'origin/fanpeng' into fanpeng
|
2025-01-17 15:48:33 +08:00 |
|
范鹏
|
d73dd25bb7
|
fix: 优化审批流程UI
|
2025-01-17 15:48:20 +08:00 |
|
范鹏
|
8bee2be96d
|
fix: 优化审批流程UI
|
2025-01-17 15:48:07 +08:00 |
|
刘燕峰
|
b6773b4d75
|
Merge branch 'fanpeng' into 'develop'
feat: 完成审批发起申请和审批中心的UI
See merge request StarlockTeam/starwork-uniapp!11
|
2025-01-17 07:04:52 +00:00 |
|
范鹏
|
76d427f84c
|
fix: 合并代码
|
2025-01-17 14:59:34 +08:00 |
|
范鹏
|
0fae1dade5
|
Merge remote-tracking branch 'origin/fanpeng' into fanpeng
# Conflicts:
# src/components/TopNavigation/TopNavigation.vue
|
2025-01-17 14:54:53 +08:00 |
|
范鹏
|
fa7c4de695
|
feat: 添加审批流程创建UI
|
2025-01-17 14:54:43 +08:00 |
|
范鹏
|
5a602a6f4d
|
fix: 优化部门和成员选择中的搜索UI
|
2025-01-17 14:54:43 +08:00 |
|
范鹏
|
14474c3d67
|
feat: 完成审批访客预约套件封装+选择门禁点页面
|
2025-01-17 14:54:43 +08:00 |
|
范鹏
|
dc3d862e62
|
feat: 修改审批组件支持行内格式+添加虚拟键盘组件+添加邀约组件
|
2025-01-17 14:54:43 +08:00 |
|
范鹏
|
3bfcf05ad9
|
feat: 完成审批模块请假、出差、外出、补卡、加班套件的封转
|
2025-01-17 14:54:43 +08:00 |
|
范鹏
|
67996568f4
|
fix: 整理页面路径
|
2025-01-17 14:54:39 +08:00 |
|
范鹏
|
03d338974e
|
fix: 合并代码
|
2025-01-17 14:54:10 +08:00 |
|
范鹏
|
3cb49a5132
|
feat: 完成申请审批说明项组件封装
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
561c84f1a9
|
feat: 完成申请审批图片上传组件封装
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
53d212ba33
|
feat: 完成申请审批时间选择器组件封装
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
84084b0758
|
feat: 完成申请审批数字组件封装
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
b9230bc394
|
feat: 完成申请审批选择器组件封装
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
871a935ecb
|
feat: 完成申请审批输入框与文本框组件封装
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
b5be5bc0ae
|
feat: 完成申请详情页UI
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
215eee5f01
|
feat: 完成审批发起申请和审批中心的UI
|
2025-01-17 14:52:47 +08:00 |
|
范鹏
|
a0b4e1f0b5
|
feat: 添加审批流程创建UI
|
2025-01-17 14:52:30 +08:00 |
|
刘燕峰
|
95a514aa5c
|
Merge branch 'develop_wsy' into 'develop'
Develop wsy
See merge request StarlockTeam/starwork-uniapp!12
|
2025-01-17 06:51:25 +00:00 |
|
刘燕峰
|
3f3d2b884c
|
Merge branch 'develop_daisy' into 'develop'
Develop daisy
See merge request StarlockTeam/starwork-uniapp!13
|
2025-01-17 06:51:08 +00:00 |
|
“DaisyWu”
|
7a2cb9f2da
|
feat: 添加发布计划页面调整
|
2025-01-17 14:41:26 +08:00 |
|
范鹏
|
0e64d092a4
|
fix: 优化部门和成员选择中的搜索UI
|
2025-01-17 13:46:39 +08:00 |
|
范鹏
|
10ce85a53d
|
feat: 完成审批访客预约套件封装+选择门禁点页面
|
2025-01-17 11:59:26 +08:00 |
|
“DaisyWu”
|
4a6c7475bf
|
feat: 添加发布计划页面UI完成
|
2025-01-17 10:52:47 +08:00 |
|
范鹏
|
f8be94b7a9
|
feat: 修改审批组件支持行内格式+添加虚拟键盘组件+添加邀约组件
|
2025-01-16 18:38:45 +08:00 |
|
“DaisyWu”
|
e58a2a1b21
|
feat: 1,星勤:信息发布模块—新增编辑图片/视频轮播页面UI布局2,星勤:信息发布模块—新增素材库UI布局3,星勤:信息发布模块—新增发布计划页面UI布局
|
2025-01-16 17:11:38 +08:00 |
|
魏少阳
|
0bcbca8d6a
|
feat: 去掉mine界面为home代码
|
2025-01-16 15:34:37 +08:00 |
|
范鹏
|
d6ff287a65
|
feat: 完成审批模块请假、出差、外出、补卡、加班套件的封转
|
2025-01-16 15:19:30 +08:00 |
|
魏少阳
|
791026b892
|
feat: 完成通行记录UI
|
2025-01-16 15:06:17 +08:00 |
|
“DaisyWu”
|
46bb7cebed
|
feat: 1，星勤：信息发布模块-新增信息发布主页相关UI及图片 2，星勤：已有页面的代码格式及风格修改统一 3，星勤：信息发布模块-新增播放内容库页面UI
|
2025-01-16 10:24:56 +08:00 |
|
范鹏
|
51123d48c8
|
fix: 整理页面路径
|
2025-01-16 09:38:56 +08:00 |
|
范鹏
|
0c35f8742c
|
feat: 完成申请审批成员及部门组件封装
|
2025-01-15 20:03:50 +08:00 |
|
魏少阳
|
88c2d3bf9e
|
feat: 完成门禁控制UI
|
2025-01-15 18:57:59 +08:00 |
|
魏少阳
|
18b4e12ea7
|
fix: 完成通行权限首页UI
|
2025-01-15 17:37:58 +08:00 |
|