Commit Graph

370 Commits

Author SHA1 Message Date
xman
66a9589b7a 完成订单重构 2025-06-01 23:06:38 +08:00
03c72b86ad Accept Merge Request #90: (feature/hant -> develop)
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/90?initial=true
2025-06-01 22:36:38 +08:00
2ab964b734 修改 2025-06-01 22:35:42 +08:00
xman
d5050f0dd0 完成订单重构 2025-06-01 22:28:02 +08:00
xman
d19845a072 完成订单重构 2025-06-01 17:27:19 +08:00
xman
d06f998573 完成订单重构 2025-06-01 16:05:08 +08:00
xman
65b705e40e 完成订单重构 2025-06-01 15:59:49 +08:00
xman
37a39dbe5d 完成订单重构 2025-06-01 15:46:01 +08:00
xman
48de1eb9ea Merge remote-tracking branch 'origin/develop' into develop 2025-05-31 18:08:05 +08:00
xman
26cd36e2ec 跟进重构 2025-05-31 18:07:49 +08:00
bb3738d47a Accept Merge Request #89: (feature/hant -> develop)
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/89?initial=true
2025-05-31 17:52:22 +08:00
995d06ea1d 修改 2025-05-31 17:48:26 +08:00
xman
21dbd1d5a5 跟进重构 2025-05-31 17:04:59 +08:00
xman
62dbe6a876 default 2025-05-31 15:33:22 +08:00
222a19a331 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-05-31 14:39:59 +08:00
a7842e1fc8 订单异常 2025-05-30 17:53:43 +08:00
zhuyu
c866b445b2 Accept Merge Request #87: (feature/zy -> develop)
Merge Request: feature: 按钮名称

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/87
2025-05-30 15:25:35 +08:00
zhuyu
886801637b feature: 按钮名称 2025-05-30 15:24:05 +08:00
f74fc4e153 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-05-29 21:31:57 +08:00
e3457cbc12 订单异常 2025-05-29 20:10:20 +08:00
zhuyu
ecb78bd587 Accept Merge Request #81: (feature/zy -> develop)
Merge Request: feature: 工资管理类型

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/81?initial=true
2025-05-29 17:24:25 +08:00
zhuyu
309fdfa3fe feature: 工资管理类型 2025-05-29 17:15:15 +08:00
zhuyu
53a2ac0ee9 Accept Merge Request #80: (feature/zy -> develop)
Merge Request: feature: 工资管理类型

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/80
2025-05-29 15:56:10 +08:00
zhuyu
a988d4d54b feature: 工资管理类型 2025-05-29 15:54:00 +08:00
zhuyu
7cbf0c5a01 feature: 工资管理 2025-05-29 15:42:23 +08:00
zhuyu
448e878813 feature: 工资管理 2025-05-29 15:30:21 +08:00
zhuyu
c7ee06d512 feature: 工资管理 2025-05-29 11:57:45 +08:00
aab0299d15 修改 2025-05-28 23:47:46 +08:00
e86888fbc6 订单异常 2025-05-28 20:27:25 +08:00
zhuyu
10fcccf53a feature: 面板 2025-05-28 17:30:03 +08:00
zhuyu
f26559be6c Accept Merge Request #75: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/75?initial=true
2025-05-28 10:59:32 +08:00
zhuyu
faa9d20ab8 feature: 面板 2025-05-28 10:58:35 +08:00
zhuyu
f19c42178f Accept Merge Request #74: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/74?initial=true
2025-05-28 10:52:39 +08:00
zhuyu
74ad433809 feature: 面板 2025-05-28 10:52:13 +08:00
zhuyu
11575df4ae feature: 面板 2025-05-28 10:43:42 +08:00
cc6e507f0e Accept Merge Request #73: (feature/hant -> develop)
Merge Request: 退款数据

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/73?initial=true
2025-05-27 23:55:22 +08:00
353fd4c3eb 退款数据 2025-05-27 23:54:30 +08:00
zhuyu
65650c76e8 Accept Merge Request #71: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/71
2025-05-27 15:09:05 +08:00
zhuyu
03a8bb681f feature: 面板 2025-05-27 14:39:06 +08:00
zhuyu
1354a77bc2 Accept Merge Request #70: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/70?initial=true
2025-05-27 13:48:40 +08:00
zhuyu
3b3c95b5e0 feature: 面板 2025-05-27 13:48:10 +08:00
zhuyu
855ea79efd Accept Merge Request #69: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/69
2025-05-27 11:11:43 +08:00
zhuyu
16010e86b0 feature: 面板 2025-05-27 11:11:06 +08:00
zhuyu
910edcb047 feature: 面板 2025-05-27 09:30:20 +08:00
5d1a7d95f4 Accept Merge Request #68: (feature/hant -> develop)
Merge Request: 退款数据

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/68?initial=true
2025-05-27 00:04:26 +08:00
1ab27a7bb8 退款数据 2025-05-27 00:03:42 +08:00
zhuyu
a304012276 Accept Merge Request #67: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/67
2025-05-26 18:16:55 +08:00
zhuyu
27310f5a3c feature: 面板 2025-05-26 18:16:06 +08:00
zhuyu
1a0061cb71 Accept Merge Request #66: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/66?initial=true
2025-05-26 18:12:14 +08:00
zhuyu
5979ce5abf feature: 面板 2025-05-26 17:26:42 +08:00
zhuyu
088aab8f3c feature: 面板 2025-05-26 12:00:23 +08:00
zhuyu
7ebb1da084 Accept Merge Request #65: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/65?initial=true
2025-05-26 11:56:32 +08:00
zhuyu
75e5a9e509 feature: 面板 2025-05-26 11:56:00 +08:00
zhuyu
c7c8ffc453 feature: 面板 2025-05-26 11:50:08 +08:00
zhuyu
72c48d1a51 Accept Merge Request #64: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/64?initial=true
2025-05-26 11:40:13 +08:00
zhuyu
d62501995d feature: 面板 2025-05-26 11:39:48 +08:00
884a41ccc8 Accept Merge Request #62: (feature/hant -> develop)
Merge Request: 退款数据

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/62?initial=true
2025-05-25 23:02:58 +08:00
feeae1c5b1 退款数据 2025-05-25 23:02:23 +08:00
5993c3e2e1 Accept Merge Request #61: (feature/hant -> develop)
Merge Request: 派单地图

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/61?initial=true
2025-05-24 19:07:54 +08:00
c6979b7129 派单地图 2025-05-24 19:07:07 +08:00
fc4f74704b map 2025-05-23 18:05:28 +08:00
zhuyu
35ac2312c8 Accept Merge Request #60: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/60?initial=true
2025-05-23 17:55:47 +08:00
zhuyu
fef82b5a66 feature: 面板 2025-05-23 17:48:10 +08:00
zhuyu
8e87f97bea Accept Merge Request #58: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/58?initial=true
2025-05-23 15:34:22 +08:00
zhuyu
5de62ecdb6 feature: 面板 2025-05-23 15:33:19 +08:00
zhuyu
d21f64d4a7 feature: 面板 2025-05-23 15:31:09 +08:00
zhuyu
adf7bd959e feature: 面板 2025-05-23 14:16:04 +08:00
zhuyu
531edc68c3 Accept Merge Request #57: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/57
2025-05-22 18:01:21 +08:00
zhuyu
8fb4af1b47 feature: 面板 2025-05-22 17:53:46 +08:00
zhuyu
4f29e8bf82 feature: dashboard 2025-05-22 15:52:45 +08:00
ebb015b51c 派单地图dome 2025-05-21 23:33:43 +08:00
zhuyu
371703296c feature: task dash 2025-05-21 17:18:19 +08:00
zhuyu
905e6091ca feature: kpi item template 2025-05-21 16:40:32 +08:00
zhuyu
598424b2c5 feature: kpi item template 2025-05-21 15:56:00 +08:00
98865bd1b6 bug 修复 2025-05-20 23:17:56 +08:00
xman
c3ef078c36 sth 2025-05-19 21:36:57 +08:00
xman
8ba818b8f5 sth 2025-05-19 14:52:33 +08:00
a314f791e7 售前绩效 2025-05-18 19:39:39 +08:00
1cf64baf95 运营补单 2025-05-18 18:41:05 +08:00
b40fb65203 自动派单 2025-05-18 16:49:03 +08:00
83a19267e8 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-05-17 18:55:56 +08:00
zhuyu
ae305ad1b5 Accept Merge Request #52: (feature/zy -> develop)
Merge Request: feature: kpi item template

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/52?initial=true
2025-05-16 16:30:35 +08:00
zhuyu
ced105d6fd feature: kpi item template 2025-05-16 14:54:49 +08:00
zhuyu
396d569913 Accept Merge Request #51: (feature/zy -> develop)
Merge Request: feature: kpi item template

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/51
2025-05-15 17:22:29 +08:00
zhuyu
24466054c7 feature: kpi template 2025-05-15 16:35:19 +08:00
zhuyu
34ae25bf46 feature: kpi item 2025-05-15 16:29:41 +08:00
大狗哥
8991ebf4e8 Accept Merge Request #50: (feature/dgg -> develop)
Merge Request: feat: 后台登录页面美化

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/50?initial=true
2025-05-15 10:56:18 +08:00
苟川东
0e8c19020c feat: 后台登录页面美化 2025-05-15 10:54:21 +08:00
gcd
2ae23df2c9 feat: 后台登录调整 2025-05-14 23:58:05 +08:00
zhuyu
de05423733 feature: kpi item 2025-05-14 11:15:03 +08:00
zhuyu
627d7cd788 feature: kpi template 2025-05-14 09:53:02 +08:00
zhuyu
009c71b287 feature: kpi template 2025-05-14 09:50:18 +08:00
8cda4bc78c 服务项目统计 2025-05-13 19:56:17 +08:00
zhuyu
3dfbbe52e0 feature: kpi 2025-05-13 18:00:03 +08:00
zhuyu
0801237869 feature: kpi 2025-05-13 17:15:29 +08:00
83dba34c3e 面板 2025-05-12 22:10:13 +08:00
685e847208 服务项目统计 2025-05-12 17:53:19 +08:00
xman
961ad7d2de sth 2025-05-12 16:38:27 +08:00
cba265cc1e 订单录入优化 2025-05-12 16:22:59 +08:00
zhuyu
45f3edc5cb Merge branch 'develop' into feature/zy 2025-05-11 17:55:37 +08:00
zhuyu
f131a658b7 feature: task 2025-05-11 17:44:49 +08:00
2c3cdc5cfd 面板 2025-05-11 17:04:56 +08:00
5d1b4f3d1e 面板 2025-05-10 18:45:18 +08:00
4d32fe4a5b 面板 2025-05-07 23:34:30 +08:00
476e61e71d Accept Merge Request #39: (feature/hant -> develop)
Merge Request: 面板

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/39?initial=true
2025-05-06 23:14:25 +08:00
85d9e8ad2b 面板 2025-05-06 23:13:42 +08:00
xman
f05b93c678 Merge remote-tracking branch 'origin/develop' into develop 2025-04-29 09:36:34 +08:00
xman
8fa06c3a53 sth 2025-04-29 09:36:19 +08:00
ad049915f9 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-04-28 22:12:23 +08:00
69cd09a63e 订单面板 2025-04-28 20:07:32 +08:00
xman
3fb6925a8f sth 2025-04-28 16:37:32 +08:00
d3f5829641 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-04-28 15:16:23 +08:00
xman
df63a6c89f sth 2025-04-28 10:22:20 +08:00
xman
b27654d765 sth 2025-04-25 16:37:07 +08:00
xman
78623550ba sth 2025-04-25 16:22:05 +08:00
xman
82447b27ad sth 2025-04-25 14:05:47 +08:00
5aba36fe1b Accept Merge Request #36: (feature/hant -> develop)
Merge Request: 看板

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/36?initial=true
2025-04-24 23:05:48 +08:00
f3e9f2640f 看板 2025-04-24 23:04:15 +08:00
xman
df587e31b5 sth 2025-04-24 17:03:12 +08:00
689376fa69 Accept Merge Request #34: (feature/hant -> develop)
Merge Request: 看板

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/34
2025-04-23 23:10:23 +08:00
33ca7a52a7 看板 2025-04-23 22:55:41 +08:00
6078af68d8 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-04-23 19:39:57 +08:00
xman
11c530b996 数据统计 2025-04-23 16:57:03 +08:00
xman
c4610806ad 派单员统计列表 2025-04-23 15:36:58 +08:00
d64fea7ac2 看板 2025-04-22 23:18:17 +08:00
xman
35f7a0d313 统计 2025-04-22 17:35:33 +08:00
xman
8f45a42d84 sth 2025-04-22 16:03:32 +08:00
xman
5ce43cf42d 新增材料成本 2025-04-22 14:36:08 +08:00
xman
bc268830ab sth 2025-04-21 16:55:44 +08:00
xman
340e9fecd7 sth 2025-04-21 14:36:29 +08:00
xman
82e4679623 sth 2025-04-21 14:32:37 +08:00
xman
ca133f4153 sth 2025-04-21 14:18:11 +08:00
xman
d7046959aa sth 2025-04-21 11:59:42 +08:00
xman
ad6e114d2b sth 2025-04-21 10:19:22 +08:00
eef4c1a5b4 Accept Merge Request #24: (feature/hant -> develop)
Merge Request: 调整

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/24?initial=true
2025-04-19 22:17:55 +08:00
6ab562edf4 调整 2025-04-19 22:16:36 +08:00
xman
f64c6808f3 sth 2025-04-19 21:51:10 +08:00
xman
910e720583 审核 2025-04-19 21:20:54 +08:00
1a285481dc Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/admin/controller/aftersales/Aftersale.php
#	application/admin/view/aftersales/aftersale/add.html
#	public/assets/js/backend/order.js
2025-04-19 17:50:09 +08:00
12ab4135ca 调整 2025-04-19 17:44:32 +08:00
xman
314fa09210 审核 2025-04-18 18:12:33 +08:00
xman
9d055a1dfe 审核 2025-04-18 17:19:04 +08:00
xman
fb99b2dbe6 审核 2025-04-18 16:54:52 +08:00
xman
bb80209ffb cmd 2025-04-18 16:37:28 +08:00
xman
b50c182e24 cmd 2025-04-18 15:55:18 +08:00
xman
579166b5e9 cmd 2025-04-18 15:47:37 +08:00
xman
9774fb8385 aftersale 2025-04-18 13:55:09 +08:00
xman
f4cae762e1 aftersale 2025-04-18 10:40:42 +08:00
57caec1805 调整 2025-04-17 23:05:48 +08:00
xman
76aa236cbd sth 2025-04-17 18:05:01 +08:00