dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
486 Commits 4 Branches 0 Tags 16 MiB
d0297f802f
Commit Graph

477 Commits

Author SHA1 Message Date
13405411873
73c0a25054 Merge branch 'master' into dev 
# Conflicts:
#	src/views/repair/screen/repairBigScreen.vue
 2024-10-23 15:19:04 +08:00
13405411873
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
deff2195f3 维修工单及项目生命周期记录完善 2024-10-23 11:20:16 +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
lzttt
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
lzttt
8257801aab 创建大屏文件 2024-10-22 10:16:28 +08:00
13405411873
e76271bf4b 维修大屏 
(cherry picked from commit ef0f733023)
 2024-10-22 09:33:28 +08:00
13405411873
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
058e72627c 开始施工、施工过程记录 2024-10-18 18:07:43 +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
lzttt
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
lzttt
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
xiaofajia
a26488930b 审批申请 2024-10-16 15:39:14 +08:00
xiaofajia
ee94473c76 账务设置工单支付方式 2024-10-16 10:42:35 +08:00
xiaofajia
f27631f460 账务设置工单支付方式 2024-10-16 10:42:13 +08:00
xiaofajia
d6a4763c60 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev 2024-10-15 22:30:59 +08:00
xiaofajia
7ceba25584 申请审核 1% 2024-10-15 22:30:49 +08:00
Vinjor
9c5846ac29 二维码打印 
(cherry picked from commit 9b939846f9)
 2024-10-15 18:47:41 +08:00
Vinjor
9b939846f9 二维码打印 2024-10-15 18:47:19 +08:00
xiaofajia
2dcc5e02ca 维修工填写配件申请单、配件是否可见 2024-10-15 18:00:35 +08:00
xiaofajia
458cb418b8 维修工接单/维修班组长重新指派 2024-10-14 17:25:49 +08:00
xiaofajia
7b16f2cff4 维修工接单/维修班组长重新指派，维修工填写配件申请单 1/2 2024-10-12 20:20:34 +08:00
xiaofajia
27f2b505ff Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev 2024-10-12 20:07:08 +08:00
xiaofajia
4362bcf887 维修工接单/维修班组长重新指派，维修工填写配件申请单 1/2 2024-10-12 20:06:56 +08:00
PQZ
75c1a042e1 1 2024-10-12 17:43:59 +08:00
lzttt
ff1d7088ef Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev 2024-10-12 12:41:42 +08:00
lzttt
f73f87119d 打印导出工单（前端） 2024-10-12 12:41:38 +08:00
xiaofajia
c036fa3153 工单指派多选 2024-10-12 12:30:30 +08:00
xiaofajia
e33bda2f9a 优化 2024-10-12 09:34:47 +08:00
xiaofajia
1e061b101b 优化部分代码与采购、领料关联配件库 2024-10-11 17:14:57 +08:00
xiaofajia
5f3c59fa93 维修开单修复 2024-10-10 17:04:17 +08:00
xiaofajia
ef5dd53e58 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev 2024-10-10 16:41:26 +08:00
xiaofajia
a45dea9b94 信息公告-完善 2024-10-10 16:41:16 +08:00
lzttt
32241a7d73 客户设置是否可挂账 2024-10-10 16:14:12 +08:00
PQZ
905ec22a77 1 2024-10-09 19:05:35 +08:00
xiaofajia
e124a1c539 信息公告 2024-10-09 15:04:39 +08:00
PQZ
4a0fcff248 代码初始化 2024-10-09 14:28:33 +08:00
xiaofajia
983776c28d 维修工单-客户、车辆信息新增、修改 2024-10-08 18:28:36 +08:00
xiao-fajia
54ae167c2b 维修工单-新增、修改用户信息 2024-09-29 18:13:07 +08:00
xiao-fajia
78ac82f238 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue 2024-09-29 09:49:31 +08:00
PQZ
d27a75ab62 1 2024-09-28 18:23:19 +08:00
xiao-fajia
6949f02772 更新代码 2024-09-27 17:22:19 +08:00
xiao-fajia
df913c6243 更新代码 2024-09-27 11:12:50 +08:00
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