72 Commits

Author SHA1 Message Date
范鹏
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
刘燕峰
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
“DaisyWu”
4a6c7475bf feat: 添加发布计划页面UI完成 2025-01-17 10:52:47 +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
魏少阳
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
魏少阳
88c2d3bf9e feat: 完成门禁控制UI 2025-01-15 18:57:59 +08:00
魏少阳
18b4e12ea7 fix: 完成通行权限首页UI 2025-01-15 17:37:58 +08:00
魏少阳
24e369f4d0 fix: 完善我的模块UI 2025-01-14 16:42:20 +08:00
魏少阳
adc087ebfe fix: 完成我的模块UI 2025-01-14 15:13:44 +08:00
米子豪
fa98742c39 Merge branch 'develop_daisy' into 'develop'
feat: 新增信息发布、广播、公告入口及公告页面部分布局UI

See merge request StarlockTeam/starwork-uniapp!9
2025-01-10 07:56:04 +00:00
米子豪
5e64561338 Merge branch 'develop_mzh' into 'develop'
Develop mzh

See merge request StarlockTeam/starwork-uniapp!10
2025-01-10 07:55:07 +00:00
米子豪
85aff7d423 feat: 1.考勤设备修改 2025-01-10 15:53:31 +08:00
范鹏
06b2b953b5 Merge branch 'fanpeng' into 'develop'
Fanpeng

See merge request StarlockTeam/starwork-uniapp!8
2025-01-10 07:53:09 +00:00
“DaisyWu”
fdfae11edf Merge branch 'develop' into develop_daisy 2025-01-10 15:53:01 +08:00
“DaisyWu”
c91cbf4550 feat: 1.星勤:信息发布模块—新增草稿箱页面布局 2.星勤:信息发布模块—新增已有公告各个页面逻辑跳转 2025-01-10 15:51:41 +08:00
范鹏
9e206f362a feat: 创建审批页面 2025-01-10 15:50:06 +08:00
范鹏
71f5296f7e feat: 添加审批页面跳转,修改wotui版本 2025-01-10 11:08:43 +08:00
米子豪
da0ec92b78 feat: 1.星寓考勤模块--考勤设备设置 2025-01-10 10:48:59 +08:00
范鹏
c7361586e8 Merge remote-tracking branch 'origin/fanpeng' into fanpeng 2025-01-09 19:16:08 +08:00
范鹏
061f179622 feat: 完成首页UI 2025-01-09 19:14:27 +08:00
米子豪
02c4636a42 feat: 1.星勤考勤模块--考勤规则说明 2.星勤考勤模块--考勤时间设置 3.星勤考勤模块--考勤特殊日期设置 2025-01-09 19:12:50 +08:00
“DaisyWu”
d4635349a6 feat: 1调整部分命名 2新增发布公告页面UI 2025-01-08 17:50:29 +08:00
范鹏
b81334e3d1 feat: 完成首页UI 2025-01-07 17:12:46 +08:00
“DaisyWu”
4173f31944 Merge branch 'develop' into develop_daisy 2025-01-07 17:03:21 +08:00
米子豪
f57ee6af3a Merge remote-tracking branch 'origin/develop' into develop_mzh 2025-01-07 17:02:30 +08:00
“DaisyWu”
07ad350e0d feat: 新增公告页面 2025-01-07 17:01:09 +08:00
米子豪
8faf8f51e3 feat: 1.下发记录详情 2025-01-07 17:00:29 +08:00
刘燕峰
fabc1b83f4 Merge branch 'fanpeng' into 'develop'
feat: 1.首页顶部信息、轮播图、待办事项、团队公告UI 2. 添加新设备登录验证 3. 首页tabs组件补充数据

See merge request StarlockTeam/starwork-uniapp!6
2025-01-07 08:59:07 +00:00
范鹏
3cd5db6612 feat: 完成首页UI 2025-01-07 16:56:58 +08:00
米子豪
edefa05ae1 feat: 1.下发记录 2.打卡时间限制 2025-01-07 14:18:28 +08:00
米子豪
b5ce56a37e feat: 1.弹性打卡设置 2025-01-07 09:52:13 +08:00
范鹏
fe9544a1d3 Merge remote-tracking branch 'origin/fanpeng' into fanpeng 2025-01-06 19:25:31 +08:00
范鹏
94e18cfb46 feat: 1.首页顶部信息、轮播图、待办事项、团队公告UI 2. 添加新设备登录验证 3. 首页tabs组件补充数据 2025-01-06 19:17:00 +08:00
范鹏
1b2acfd370 feat: 1.首页顶部信息、轮播图、待办事项、团队公告UI 2. 添加新设备登录验证 3. 首页tabs组件补充数据 2025-01-06 19:17:00 +08:00
范鹏
6187e34b34 feat: 1.首页顶部信息、轮播图、待办事项、团队公告UI 2. 添加新设备登录验证 3. 首页tabs组件补充数据 2025-01-06 19:16:47 +08:00
范鹏
2dc96545b9 feat: 1.首页顶部信息、轮播图、待办事项、团队公告UI 2. 添加新设备登录验证 3. 首页tabs组件补充数据 2025-01-06 19:16:31 +08:00
米子豪
5265a7c1c6 feat: 1.班次管理 2.新增班次 2025-01-06 17:21:30 +08:00
米子豪
6dafdd6bc2 Merge remote-tracking branch 'origin/develop' into develop_mzh
# Conflicts:
#	src/pages/home/home.vue
2025-01-06 10:19:55 +08:00
米子豪
b73b5e52b2 feat: 1.考勤规则页面 2025-01-06 10:19:07 +08:00
“DaisyWu”
df7563be13 Merge branch 'develop' into develop_daisy
# Conflicts:
#	src/pages/home/home.vue
2025-01-03 18:17:19 +08:00
范鹏
50040db7c9 Merge branch 'fanpeng' into 'develop'
Fanpeng

See merge request StarlockTeam/starwork-uniapp!5
2025-01-03 10:15:57 +00:00
范鹏
9029e334bf fix: 修改代码格式 2025-01-03 18:14:33 +08:00
米子豪
e2653a3674 Merge remote-tracking branch 'origin/develop' into develop_mzh 2025-01-03 15:49:45 +08:00