|
|
73c0a25054
|
Merge branch 'master' into dev
# Conflicts:
# src/views/repair/screen/repairBigScreen.vue
|
2024-10-23 15:19:04 +08:00 |
|
|
|
46bb95a5ee
|
配置文件
|
2024-10-23 15:18:19 +08:00 |
|
xiaofajia
|
54f0c80496
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-23 14:33:42 +08:00 |
|
xiaofajia
|
0509974c82
|
更新代码，暂提
|
2024-10-23 14:33:28 +08:00 |
|
许允枞
|
0103ae6612
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-23 14:26:40 +08:00 |
|
许允枞
|
cecce06e0f
|
检测大屏更新
|
2024-10-23 14:26:16 +08:00 |
|
Vinjor
|
fac9b26adf
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue
|
2024-10-23 13:16:57 +08:00 |
|
Vinjor
|
45d6b165f5
|
bug
|
2024-10-23 13:16:43 +08:00 |
|
xiaofajia
|
2c037d5a49
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-23 11:20:29 +08:00 |
|
xiaofajia
|
deff2195f3
|
维修工单及项目生命周期记录完善
|
2024-10-23 11:20:16 +08:00 |
|
|
|
c8751f07c9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-23 10:30:34 +08:00 |
|
|
|
28e2b41d0a
|
配置文件
|
2024-10-23 10:30:14 +08:00 |
|
xiaofajia
|
47866bb68f
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-22 23:43:38 +08:00 |
|
xiaofajia
|
dc3153b1af
|
维修工单及项目生命周期记录完善
|
2024-10-22 23:43:26 +08:00 |
|
许允枞
|
8672012b06
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-22 18:10:33 +08:00 |
|
许允枞
|
e16de18dd2
|
检测大屏更新
|
2024-10-22 18:10:10 +08:00 |
|
xiaofajia
|
742f1bde16
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-22 15:57:23 +08:00 |
|
xiaofajia
|
5a3b3c3aaf
|
配件领退修改最后完善
|
2024-10-22 15:57:07 +08:00 |
|
PQZ
|
aa42ceb0b8
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
# Conflicts:
# src/views/repair/screen/repairBigScreen.vue
|
2024-10-22 15:22:37 +08:00 |
|
PQZ
|
9161d983a7
|
1
|
2024-10-22 15:20:50 +08:00 |
|
xiaofajia
|
13382730d3
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-22 10:31:51 +08:00 |
|
|
|
5335e0c924
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-22 10:16:34 +08:00 |
|
|
|
8257801aab
|
创建大屏文件
|
2024-10-22 10:16:28 +08:00 |
|
|
|
e76271bf4b
|
维修大屏
(cherry picked from commit ef0f733023)
|
2024-10-22 09:33:28 +08:00 |
|
|
|
ef0f733023
|
维修大屏
|
2024-10-22 08:55:36 +08:00 |
|
xiaofajia
|
2ef00ca02b
|
配件领退修改
|
2024-10-21 21:37:07 +08:00 |
|
Vinjor
|
611bc1521e
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-21 18:09:51 +08:00 |
|
Vinjor
|
2c6b677884
|
bug
|
2024-10-21 18:09:45 +08:00 |
|
xiaofajia
|
bcf45748ac
|
配件领退修改1/2
|
2024-10-19 22:55:25 +08:00 |
|
xiaofajia
|
f8f8bc33e2
|
暂提
|
2024-10-19 17:00:20 +08:00 |
|
xiaofajia
|
5e4b167684
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-19 11:06:19 +08:00 |
|
xiaofajia
|
9698765ac7
|
开始施工-施工中-施工完成 100%
|
2024-10-19 11:06:09 +08:00 |
|
Vinjor
|
6b709a7622
|
解决图片上传组件bug
|
2024-10-19 10:46:47 +08:00 |
|
xiaofajia
|
fdcc7367e3
|
施工完成1/2
|
2024-10-18 23:14:29 +08:00 |
|
xiaofajia
|
e9fb87dec7
|
配件是否可见
|
2024-10-18 22:02:51 +08:00 |
|
xiaofajia
|
45df31c413
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
# Conflicts:
# src/views/repair/tickets/Components/UserInfo.vue
|
2024-10-18 18:08:37 +08:00 |
|
xiaofajia
|
058e72627c
|
开始施工、施工过程记录
|
2024-10-18 18:07:43 +08:00 |
|
Vinjor
|
1d54429c82
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-18 13:21:00 +08:00 |
|
Vinjor
|
959c84afbd
|
维修开单去掉会员卡券
|
2024-10-18 13:20:54 +08:00 |
|
xiaofajia
|
c9b026d327
|
退料bug修复
|
2024-10-18 09:57:44 +08:00 |
|
Vinjor
|
c459dff15b
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-18 09:28:54 +08:00 |
|
Vinjor
|
f06072e1df
|
发送消息测试
|
2024-10-18 09:28:46 +08:00 |
|
xiaofajia
|
4df130985e
|
退料
|
2024-10-17 23:39:54 +08:00 |
|
xiaofajia
|
46e7b3d3bf
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-17 17:30:09 +08:00 |
|
xiaofajia
|
7d87a13ea0
|
暂提
|
2024-10-17 17:29:58 +08:00 |
|
|
|
e8a5ca2864
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev
|
2024-10-17 17:18:38 +08:00 |
|
|
|
97c1eb6f81
|
识别代办
|
2024-10-17 17:18:35 +08:00 |
|
xiaofajia
|
d79160ac53
|
申请转采购
|
2024-10-17 12:10:33 +08:00 |
|
xiaofajia
|
2d70581fff
|
仓库处理申请、员工确认领料
|
2024-10-16 22:39:35 +08:00 |
|
xiaofajia
|
a839658d75
|
完善工单结算
|
2024-10-16 16:26:36 +08:00 |
|
