Commit Graph

399 Commits

Author SHA1 Message Date
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
PQZ
8d55971747 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-09 09:11:46 +08:00
PQZ
7d2864d8a8 调整 2024-08-09 08:16:23 +08:00
“hhk”
8a8bb098f0 资产管理字典值维护 2024-08-08 20:37:50 +08:00
“hhk”
1e107350a5 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-08 20:25:55 +08:00
“hhk”
f844841e1e 资产管理页面样式优化 2024-08-08 20:25:34 +08:00
xiao-fajia
639cfef676 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue
 Conflicts:
	src/utils/dict.js
2024-08-08 20:19:46 +08:00
xiao-fajia
e280e56dde 企业管理-员工管理 2024-08-08 20:19:21 +08:00
“hhk”
2bc71eb413 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-08 20:11:30 +08:00
“hhk”
888ff1fb07 资产管理初始化 2024-08-08 20:10:23 +08:00
PQZ
40cd85f233 1 2024-08-08 20:01:17 +08:00
PQZ
18c84d27ca 1 2024-08-08 17:35:27 +08:00
PQZ
7738a882ba Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-08 11:41:06 +08:00
PQZ
f4665a681a 1 2024-08-08 11:41:02 +08:00
“hhk”
3c156cc146 车辆品牌型号优化;样式优化 2024-08-08 10:56:01 +08:00
PQZ
37d52f37bf 1 2024-08-08 10:09:18 +08:00
PQZ
a7cf0cc008 调整 2024-08-07 19:53:01 +08:00
“hhk”
6d153049e3 暂提 2024-08-07 18:51:14 +08:00
PQZ
a271a410e2 调整 2024-08-07 18:16:02 +08:00
“hhk”
14404f023e 品牌型号选择器 2024-08-07 18:01:09 +08:00
“hhk”
92c5d66f51 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-07 16:22:33 +08:00
“hhk”
cb3bd9f88b 车辆打标签 2024-08-07 16:20:17 +08:00
xiao-fajia
bf36f002fe Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-07 16:08:27 +08:00
Vinjor
be3ea032a5 分类字典 2024-08-07 16:05:04 +08:00
xiao-fajia
c3b05de34b Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue
 Conflicts:
	src/utils/dict.js
2024-08-07 15:55:40 +08:00