Commit Graph

123 Commits

Author SHA1 Message Date
赵旭
b9e46c9639 bug 2024-08-28 00:53:15 +08:00
赵旭
eb126928f2 Merge remote-tracking branch 'origin/master' 2024-08-26 23:43:14 +08:00
赵旭
4ea5b443ff 11 2024-08-26 23:43:09 +08:00
xiao-fajia
20c6070868 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-26 16:16:17 +08:00
xiao-fajia
e9ecc30ed5 救援新功能1/2 2024-08-26 16:16:12 +08:00
赵旭
d04ac251fe Merge remote-tracking branch 'origin/master' 2024-08-26 00:44:07 +08:00
赵旭
9d642c1ae5 11 2024-08-26 00:44:02 +08:00
xiao-fajia
aaa1de240e 救援集成进度4/5 2024-08-24 19:46:58 +08:00
xiao-fajia
f42a3582fb Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-24 19:39:23 +08:00
xiao-fajia
2a436c650a 救援集成进度4/5 2024-08-24 19:39:17 +08:00
赵旭
b939986505 Merge remote-tracking branch 'origin/master' 2024-08-24 01:10:55 +08:00
赵旭
b8bbd552f6 11 2024-08-24 01:10:50 +08:00
xiao-fajia
05be79b026 救援集成进度3/5 2024-08-22 21:18:33 +08:00
xiao-fajia
69c9a06975 救援集成进度2/5 2024-08-20 18:57:23 +08:00
xiao-fajia
e150793fcd 救援集成进度1/5 2024-08-19 19:13:26 +08:00
xiao-fajia
fc9837fc01 救援菜单配置 2024-08-19 14:30:06 +08:00
xiao-fajia
939c460d82 资产管理ALL 2024-08-19 09:17:39 +08:00
xiao-fajia
35f2301f7b 资产管理90% 2024-08-17 20:29:20 +08:00
xiao-fajia
9affd194e7 杂项补正 2024-08-17 09:58:30 +08:00
xiao-fajia
9d930376cc 资产处置查询 2024-08-17 09:50:27 +08:00
xiao-fajia
7901160e1b 资产维修\保养 2024-08-16 22:02:03 +08:00
xiao-fajia
11be7c8261 资产处置新增 2024-08-16 21:58:09 +08:00
xiao-fajia
095a1d913a Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-16 17:26:56 +08:00
xiao-fajia
ad4e9766a6 资产维修\保养 2024-08-16 17:26:49 +08:00
zhuchunyun
f804b2a765 救援 2024-08-16 13:46:48 +08:00
PQZ
8e9a66cd2b Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-16 08:28:37 +08:00
PQZ
b6745982ca 1 2024-08-16 08:28:32 +08:00
xiao-fajia
21a0949135 资产管理CRUD 2024-08-15 20:18:55 +08:00
xiao-fajia
dcf8442ce7 资产管理 2024-08-15 15:46:25 +08:00
xiao-fajia
e142f11344 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-14 20:02:28 +08:00
xiao-fajia
8869eeb87f 员工加角色 2024-08-14 20:02:22 +08:00
Vinjor
0442e46353 资产存放位置完成 2024-08-14 17:50:25 +08:00
PQZ
781b5fb7f0 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-14 16:25:49 +08:00
PQZ
65ebb1831a 车辆管理相关 2024-08-14 16:25:47 +08:00
Vinjor
701f0395b8 资产存放位置 2024-08-14 14:33:56 +08:00
xiao-fajia
27d702b9bd 企业管理-员工管理 2024-08-14 13:38:15 +08:00
xiao-fajia
7d432fcdd1 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue
 Conflicts:
	src/views/company/staff/form/StaffForm.vue
2024-08-14 11:59:37 +08:00
xiao-fajia
50fa557e40 企业管理-员工管理 2024-08-14 11:56:08 +08:00
Vinjor
f55b8674fa 资产存放位置--完成20% 2024-08-14 10:19:30 +08:00
Vinjor
cd535d5c0b Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-13 17:17:01 +08:00
Vinjor
437cea8dc7 创建用户账号和密码的长度限制 2024-08-13 17:16:58 +08:00
PQZ
71129b0f0c 车辆计算内容 2024-08-13 17:01:16 +08:00
xiao-fajia
dade73dfda Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-13 10:43:07 +08:00
xiao-fajia
8ae61b472c 企业管理-员工管理 2024-08-13 10:42:55 +08:00
愉快的大福
17cfb910e0 zhishi 2024-08-13 09:08:22 +08:00
愉快的大福
9fd23ae016 知识模块 2024-08-12 18:49:20 +08:00
Vinjor
bc6d534599 数据大屏自动登录 2024-08-12 16:53:18 +08:00
Vinjor
03f6b7ee0b 资产挪包 2024-08-12 15:40:13 +08:00
“hhk”
9c52e4bc7d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-12 11:28:13 +08:00
“hhk”
82bfc26af3 功能完善 2024-08-12 11:27:44 +08:00