dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
411 Commits 3 Branches 0 Tags 15 MiB
1bbc06f822
Commit Graph

402 Commits

Author SHA1 Message Date
xiao-fajia
f8c3acf722 更新代码 2024-09-26 18:43:10 +08:00
xiao-fajia
66ddc8b9c5 更新代码 2024-09-26 18:23:54 +08:00
xiao-fajia
2f018a3294 更新代码 2024-09-26 10:42:40 +08:00
xiao-fajia
379d1d83bc 更新代码 2024-09-25 19:38:46 +08:00
xiao-fajia
dd35097c2e Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-25 18:31:12 +08:00
xiao-fajia
37d1d4f4a4 更新代码 2024-09-25 18:31:06 +08:00
PQZ
0e8f508b2d 1 2024-09-25 18:29:28 +08:00
xiao-fajia
d8036252db 更新代码 2024-09-25 18:15:28 +08:00
PQZ
56ae63493d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-25 17:44:03 +08:00
PQZ
bf3aac5b3b 1 2024-09-25 17:44:00 +08:00
xiao-fajia
d1b87c152c 更新代码 2024-09-25 17:34:42 +08:00
PQZ
dd6490f5ff Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-25 16:31:50 +08:00
PQZ
9316b2fc56 1 2024-09-25 16:31:48 +08:00
xiao-fajia
61cf0debb6 更新代码 2024-09-25 16:08:52 +08:00
xiao-fajia
bce5b7b66b 更新代码 2024-09-25 15:53:59 +08:00
xiao-fajia
57780afa84 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-25 15:43:10 +08:00
xiao-fajia
0100f93a2a 更新代码 2024-09-25 15:42:23 +08:00
PQZ
7f941264f9 1 2024-09-25 15:17:09 +08:00
PQZ
93acd9eab1 1 2024-09-24 22:33:34 +08:00
xiao-fajia
f88095f2f0 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 
# Conflicts:
#	src/views/login.vue
 2024-09-24 20:54:01 +08:00
xiao-fajia
d69eef5ee9 更新代码 2024-09-24 20:53:35 +08:00
PQZ
b9ea6b7620 1 2024-09-24 19:36:22 +08:00
PQZ
fbf2401cf4 订单管理 2024-09-24 15:12:25 +08:00
PQZ
9f8f1a5648 1 2024-09-24 13:56:43 +08:00
PQZ
5505656d59 1 2024-09-24 13:30:52 +08:00
PQZ
b6ce2139c9 1 2024-09-24 13:30:48 +08:00
13405411873
684b950c33 全局处理 2024-09-23 23:36:40 +08:00
PQZ
1e4b7c5935 支付 2024-09-23 23:17:38 +08:00
PQZ
c7708dd718 1111 2024-09-23 23:06:43 +08:00
PQZ
bcc9758db3 1 2024-09-23 20:27:39 +08:00
PQZ
94c0bf5d96 1 2024-09-23 15:28:05 +08:00
PQZ
665ab7326b 1 2024-09-23 14:28:32 +08:00
xiao-fajia
0d921e70a8 更新代码 2024-09-23 09:00:16 +08:00
xiao-fajia
85a6461d8b 更新代码 2024-09-23 08:45:17 +08:00
xiao-fajia
ed3391a071 更新代码 2024-09-23 08:43:30 +08:00
xiao-fajia
a850c6f694 更新代码 2024-09-22 21:38:20 +08:00
xiao-fajia
c99a04622e Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-21 20:43:07 +08:00
xiao-fajia
d4b1884849 更新代码 2024-09-21 20:42:56 +08:00
PQZ
380e4e3c1d 1 2024-09-21 13:59:25 +08:00
PQZ
b46a55cbfd Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 
# Conflicts:
#	src/views/login.vue
 2024-09-20 22:59:32 +08:00
PQZ
7cb8a585cd 1 2024-09-20 22:58:32 +08:00
xiao-fajia
4a40655ca2 更新代码 2024-09-20 21:21:39 +08:00
PQZ
614b816bc4 1 2024-09-20 20:39:38 +08:00
PQZ
695ed397f2 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-20 16:24:03 +08:00
PQZ
6f6bb47263 1 2024-09-20 16:23:59 +08:00
xiao-fajia
ff3c246049 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-20 16:22:01 +08:00
xiao-fajia
f7699f76bd 更新代码 2024-09-20 16:21:46 +08:00
zhaotianfeng
3914d1a5d0 会员等级展示 2024-09-20 16:00:16 +08:00
zhaotianfeng
3572d75cbf 1、客户关联会员；2、营销活动下加上是否重复参与字段 2024-09-20 15:39:19 +08:00
13405411873
ba4d3db00d Merge remote-tracking branch 'origin/master' 2024-09-20 01:41:06 +08:00
13405411873
1136aa1cfe ``` 2024-09-20 01:39:06 +08:00
PQZ
a85bf4c466 1 2024-09-20 01:20:40 +08:00
PQZ
0636b4a78c 1 2024-09-20 00:16:34 +08:00
PQZ
fc1fe76977 1 2024-09-19 23:54:23 +08:00
PQZ
abc5bd3d12 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-19 22:54:05 +08:00
PQZ
85d81ccc68 会员管理 2024-09-19 22:54:02 +08:00
xiao-fajia
843a3ba11f Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-19 19:46:39 +08:00
xiao-fajia
4ee9a84b56 更新代码 2024-09-19 19:46:32 +08:00
Lihx
76f5f58678 Merge remote-tracking branch 'origin/master' 2024-09-19 18:03:28 +08:00
Lihx
b09b45bf81 上线 2024-09-19 18:00:36 +08:00
PQZ
572ddb6269 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-19 16:14:17 +08:00
PQZ
11cfa6169e 会员营销 2024-09-19 16:14:14 +08:00
xiao-fajia
6ab9561cef 更新代码 2024-09-19 15:25:40 +08:00
xiao-fajia
8324cf9233 更新代码 2024-09-18 20:00:31 +08:00
xiao-fajia
12bdfea200 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-18 14:59:50 +08:00
xiao-fajia
a99907fbf2 更新代码 2024-09-18 14:59:38 +08:00
PQZ
683c9adf16 配件库管理 2024-09-18 14:12:35 +08:00
PQZ
b68b9de81a Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-18 08:46:28 +08:00
PQZ
12f230e212 1 2024-09-18 08:46:25 +08:00
Vinjor
f7bdee8d14 上传图片和附件路径调整为相对路径 2024-09-14 18:41:05 +08:00
xiao-fajia
9ec6e7a515 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-14 18:29:54 +08:00
xiao-fajia
1aad791aa2 更新代码 2024-09-14 18:27:01 +08:00
nyoung
9fd0101266 1 2024-09-14 11:50:34 +08:00
xiao-fajia
1faedc0334 更新代码 2024-09-14 11:33:58 +08:00
PQZ
ca45362923 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-14 09:37:36 +08:00
PQZ
0268549865 1 2024-09-14 09:37:33 +08:00
xiao-fajia
81f23067b0 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-13 18:31:24 +08:00
xiao-fajia
0f8ceb083f 维修业务库init 2024-09-13 18:31:13 +08:00
PQZ
e6aacbde9f 1 2024-09-13 17:17:13 +08:00
PQZ
cea123e213 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-12 18:37:54 +08:00
PQZ
6fd4776c9a 1 2024-09-12 18:37:51 +08:00
xiao-fajia
9c2c84b78e Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-12 18:29:19 +08:00
xiao-fajia
38031ad305 工单管理1/2 2024-09-12 18:29:04 +08:00
PQZ
e42513c325 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-12 11:09:00 +08:00
PQZ
81a8d72403 供应商管理 2024-09-12 11:08:56 +08:00
xiao-fajia
631f4aa18a 调拨管理1/2 2024-09-12 10:33:40 +08:00
xiao-fajia
cdec671a9b 误操作复原 2024-09-11 19:03:20 +08:00
xiao-fajia
f191c11b75 维修采购\领料1/2 2024-09-11 18:56:43 +08:00
xiao-fajia
035c130687 维修采购\领料1/2 2024-09-11 18:49:43 +08:00
PQZ
cf70fa27a3 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-10 19:14:38 +08:00
PQZ
4de4def9d1 1 2024-09-10 19:14:35 +08:00
PQZ
f699cba7c0 1 2024-09-10 19:14:31 +08:00
xiao-fajia
68d5d883d8 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-10 18:51:09 +08:00
xiao-fajia
7c79da8dc8 维修相关字典init 2024-09-10 18:51:00 +08:00
PQZ
9fd9c7c084 账目分类，配件分类，服务分类 2024-09-10 17:56:04 +08:00
PQZ
afa495c953 1 2024-09-10 15:45:08 +08:00
PQZ
c0816c40f3 代码生成 2024-09-09 19:30:57 +08:00
PQZ
ec5c1b9285 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-06 18:03:34 +08:00
xiao-fajia
f0c0e1d9ef 扣车管理3 2024-09-06 15:21:53 +08:00
PQZ
d8790dbd01 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-06 15:12:40 +08:00
PQZ
f8677155ae 1 2024-09-06 15:12:36 +08:00
xiao-fajia
9114ba8434 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-06 11:31:43 +08:00
xiao-fajia
d6feea2825 扣车管理2 2024-09-06 11:31:09 +08:00
nyoung
6afa3f267e Merge remote-tracking branch 'origin/master' 2024-09-06 11:21:27 +08:00
nyoung
7a74264ff2 1 2024-09-06 11:21:18 +08:00
xiao-fajia
556bcb5320 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-05 18:13:08 +08:00
nyoung
40d6c83a9a 扣车管理1 2024-09-05 18:12:51 +08:00
nyoung
f0da151f3c 1 2024-09-04 22:35:01 +08:00
nyoung
e3a6a1ade4 1 2024-09-03 23:13:58 +08:00
nyoung
c27720eea0 1 2024-09-01 21:38:13 +08:00
nyoung
b632f62693 1 2024-09-01 21:18:38 +08:00
PQZ
b8d84c0cd7 1 2024-08-31 09:28:18 +08:00
xiao-fajia
16ee494983 代码补正 2024-08-31 09:06:55 +08:00
xiao-fajia
638339cbce 代码补正 2024-08-31 08:45:01 +08:00
nyoung
8f6ac09c0d Merge remote-tracking branch 'origin/master' 2024-08-31 00:09:55 +08:00
nyoung
1477b721bb 1 2024-08-31 00:08:49 +08:00
xiao-fajia
664449f090 代码补正 2024-08-30 16:21:02 +08:00
赵旭
7a0e5680b8 Merge remote-tracking branch 'origin/master' 2024-08-29 22:20:45 +08:00
赵旭
834020e7e8 bug 2024-08-29 22:20:40 +08:00
xiao-fajia
ded5de4057 代码补正 2024-08-29 19:23:08 +08:00
xiao-fajia
5aa3e8b2e3 档案管理3 2024-08-29 19:18:18 +08:00
xiao-fajia
ecbb4851ef Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-29 14:42:53 +08:00
xiao-fajia
3cb358495e 档案管理3 2024-08-29 14:42:46 +08:00
赵旭
fa71d15e1e Merge remote-tracking branch 'origin/master' 2024-08-28 23:58:48 +08:00
赵旭
0e3661c3aa bug 2024-08-28 23:58:39 +08:00
xiao-fajia
672acee0f0 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-08-28 20:39:02 +08:00
xiao-fajia
40dd5fb57e 档案管理2 2024-08-28 20:38:55 +08:00
赵旭
d7e9b3d491 Merge remote-tracking branch 'origin/master' 2024-08-28 00:53:20 +08:00
赵旭
b9e46c9639 bug 2024-08-28 00:53:15 +08:00
xiao-fajia
e48b5160d2 档案管理1 2024-08-27 20:56:34 +08:00
xiao-fajia
e7ade0eb34 代码补正 2024-08-27 14:46:31 +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
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
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