Commit Graph

504 Commits

Author SHA1 Message Date
xman
37a39dbe5d 完成订单重构 2025-06-01 15:46:01 +08:00
xman
6d69f99d5a 跟进重构 2025-06-01 14:33:53 +08:00
xman
ea2901e902 跟进重构 2025-06-01 14:08:21 +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
6e6074b7dc 跟进重构 2025-05-31 17:06:46 +08:00
xman
62dbe6a876 default 2025-05-31 15:33:22 +08:00
xman
e548cf86a4 sort 2025-05-31 15:21:01 +08:00
222a19a331 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-05-31 14:39:59 +08:00
xman
8ff54692cf Merge branch 'develop' of https://e.coding.net/g-bcrc3009/allocatr/allocatr into develop 2025-05-31 14:14:49 +08:00
xman
b482a351c1 sort 2025-05-31 14:14:29 +08:00
大狗哥
7708573526 Accept Merge Request #88: (feature/dgg -> develop)
Merge Request:  feat: 【后台配置订单列表】新增是否使用材料、材料凭证图片组字段

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/88
2025-05-30 23:54:14 +08:00
gcd
b6d2aa21e9 feat: 【后台配置订单列表】新增是否使用材料、材料凭证图片组字段 2025-05-30 23:52:11 +08:00
gcd
0be26ff745 feat: 【后台配置订单列表】新增是否使用材料、材料凭证图片组字段 2025-05-30 23:25:48 +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
大狗哥
e2d99f31c2 Accept Merge Request #86: (feature/dgg -> develop)
Merge Request: feat: 【后端API】后台跟进列表增加当前进度相关字段

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/86
2025-05-30 14:16:28 +08:00
苟川东
85b85e50cc feat: 【后端API】后台跟进列表增加当前进度相关字段 2025-05-30 14:16:02 +08:00
大狗哥
5b5068d720 Accept Merge Request #85: (feature/dgg -> develop)
Merge Request: feat: 【后端API】小程序仅显示自动派单的订单;后台跟进列表增加当前进度相关字段

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/85
2025-05-30 14:04:33 +08:00
苟川东
d9e862abe6 feat: 【后端API】小程序仅显示自动派单的订单;后台跟进列表增加当前进度相关字段 2025-05-30 14:04:03 +08:00
zhuyu
8e1ef28388 feature: 按钮名称 2025-05-30 11:33:26 +08:00
zhuyu
b0df16f41a feature: 按钮名称 2025-05-30 11:27:57 +08:00
zhuyu
a6550ec5ad Accept Merge Request #84: (feature/zy -> develop)
Merge Request: feature: 按钮名称

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/84?initial=true
2025-05-30 11:19:35 +08:00
zhuyu
3093231b7a feature: 按钮名称 2025-05-30 11:19:02 +08:00
zhuyu
b6b2554fa0 Accept Merge Request #83: (feature/zy -> develop)
Merge Request: feature: 结算按钮

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/83
2025-05-30 10:26:26 +08:00
zhuyu
3487f07a2c feature: 结算按钮 2025-05-30 10:13:20 +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
60960debe7 feature: 工资管理 2025-05-29 14:48:47 +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
831a47b19b Accept Merge Request #78: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/78?initial=true
2025-05-28 11:20:27 +08:00
zhuyu
5208dd3dcd feature: 面板 2025-05-28 11:20: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
74ad433809 feature: 面板 2025-05-28 10:52:13 +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
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
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
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
zhuyu
fdf5858308 Accept Merge Request #63: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/63?initial=true
2025-05-26 11:01:00 +08:00
zhuyu
a9c1c75826 feature: 面板 2025-05-26 11:00:33 +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
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
01ff921514 feature: 面板 2025-05-23 15:09:32 +08:00
zhuyu
ba346a4520 feature: 面板 2025-05-23 15:02:36 +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
73700581bf feature: 面板 2025-05-22 17:55:28 +08:00
zhuyu
8fb4af1b47 feature: 面板 2025-05-22 17:53:46 +08:00
a419626aae Accept Merge Request #56: (feature/hant -> develop)
Merge Request: 派单地图dome

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/56?initial=true
2025-05-21 23:34:41 +08:00
ebb015b51c 派单地图dome 2025-05-21 23:33:43 +08:00
zhuyu
2bc5b6c88a feature: schedule 2025-05-21 17:07:19 +08:00
zhuyu
db33a9b225 feature: schedule 2025-05-21 17:04:52 +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
22975d6115 Accept Merge Request #55: (feature/hant -> develop)
Merge Request: bug 修复

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/55?initial=true
2025-05-20 23:18:56 +08:00
98865bd1b6 bug 修复 2025-05-20 23:17:56 +08:00
xman
d8a8bcfb71 sth 2025-05-20 21:50:50 +08:00
xman
c3ef078c36 sth 2025-05-19 21:36:57 +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
c37a768faa feature: kpi item template 2025-05-16 16:15:12 +08:00
zhuyu
ced105d6fd feature: kpi item template 2025-05-16 14:54:49 +08:00
xman
fe8f24543f sth 2025-05-16 13:58:52 +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
eb531334f6 feature: kpi item template 2025-05-15 17:20:46 +08:00
zhuyu
8552683047 feature: kpi template 2025-05-15 16:54:50 +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
gcd
2ae23df2c9 feat: 后台登录调整 2025-05-14 23:58:05 +08:00
zhuyu
a087a9d4c8 feature: kpi template 2025-05-14 10:41:39 +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
cba265cc1e 订单录入优化 2025-05-12 16:22:59 +08:00
zhuyu
2d3a85ca8c feature: schedule 2025-05-11 21:57:03 +08:00
zhuyu
947bb0a093 feature: task 2025-05-11 18:59:39 +08:00
2c3cdc5cfd 面板 2025-05-11 17:04:56 +08:00
5d1b4f3d1e 面板 2025-05-10 18:45:18 +08:00
xman
75e56d8bbb sth 2025-05-08 14:45:42 +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
e947683638 sth 2025-04-29 14:30:47 +08:00
51721c104a ditu 2025-04-28 22:22:21 +08:00
xman
3fb6925a8f sth 2025-04-28 16:37:32 +08:00
xman
a5ae44b6a4 sth 2025-04-28 16:00:28 +08:00
xman
b0739941af sth 2025-04-28 15:42:48 +08:00
xman
78623550ba sth 2025-04-25 16:22:05 +08:00
xman
82447b27ad sth 2025-04-25 14:05:47 +08:00
xman
df587e31b5 sth 2025-04-24 17:03:12 +08:00
xman
9f9193a2c8 sth 2025-04-24 16:58:38 +08:00
xman
06715272c8 sth 2025-04-24 16:10: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
a97a73a7de 看板 2025-04-23 23:09:31 +08:00
33ca7a52a7 看板 2025-04-23 22:55:41 +08:00
xman
7e4837da66 sth 2025-04-23 17:43:06 +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
3c829efb54 sth 2025-04-22 13:49:15 +08:00
xman
c55bdf99b7 sth 2025-04-21 16:29:25 +08:00
xman
b72181167e sth 2025-04-21 14:21:56 +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
b54d750569 sth 2025-04-21 10:47:19 +08:00
xman
afe08adbc8 sth 2025-04-21 10:40:01 +08:00
xman
4bc3989eff sth 2025-04-21 10:37:21 +08:00
xman
2e61682f94 sth 2025-04-21 10:17:16 +08:00
xman
47e27cbb85 sth 2025-04-21 10:00:24 +08:00
xman
95be774da9 sth 2025-04-21 09:41:46 +08:00
xman
f27397c8c1 审核 2025-04-19 21:38:56 +08:00
xman
acfb1a7371 审核 2025-04-19 21:27:54 +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
b5c9f6e29b 审核 2025-04-18 17:25:28 +08:00
xman
9d055a1dfe 审核 2025-04-18 17:19:04 +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
e3dabec8a5 cmd 2025-04-18 15:26:20 +08:00
xman
4ca210b2af cmd 2025-04-18 15:25:10 +08:00
xman
5058caaec3 aftersale 2025-04-18 14:35:56 +08:00
xman
d3d4f6c2e9 aftersale 2025-04-18 14:22:46 +08:00
xman
d810221943 aftersale 2025-04-18 14:00:43 +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
xman
3af4172660 sth 2025-04-17 16:55:10 +08:00
e36704bd28 Accept Merge Request #21: (feature/hant -> develop)
Merge Request: 开票

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/21?initial=true
2025-04-17 11:18:45 +08:00
1ac760222c 开票 2025-04-17 11:17:40 +08:00
xman
19b255c404 sth 2025-04-17 10:46:48 +08:00
xman
64b2c282ff sth 2025-04-17 10:14:26 +08:00
a916c55786 开票 2025-04-16 17:51:41 +08:00
xman
72d03eba45 Merge branch 'feature/xman' into develop 2025-04-16 10:31:50 +08:00
xman
5bce8cf36c sth 2025-04-16 10:27:30 +08:00
xman
9796c6ba53 sth 2025-04-16 09:28:07 +08:00
16aeb48c8f Accept Merge Request #20: (feature/hant -> develop)
Merge Request: 订单操作

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/20?initial=true
2025-04-15 22:36:09 +08:00
6b5d8df018 订单操作 2025-04-15 22:32:43 +08:00
xman
eab24c03a5 sth 2025-04-15 17:58:57 +08:00
xman
dd67cb9d13 添加日志 2025-04-15 17:58:27 +08:00
xman
361008509a 添加日志 2025-04-14 11:31:10 +08:00
xman
b907583658 添加日志 2025-04-14 11:28:10 +08:00
xman
a37cd1b7f3 sth 2025-04-12 20:20:11 +08:00
xman
aed7236fe3 sth 2025-04-12 20:17:42 +08:00
xman
02cd6b94c7 sth 2025-04-12 20:08:12 +08:00
xman
8424126ffd sth 2025-04-12 19:54:05 +08:00
xman
ebc11c0513 sth 2025-04-12 19:32:15 +08:00
xman
d4521e4410 sth 2025-04-12 18:46:27 +08:00
017d9456c3 添加订单取消 2025-04-10 21:55:43 +08:00
6d9772e6c9 取消订单 2025-04-09 20:21:49 +08:00
c71ca560c8 添加订单报错 2025-04-08 22:07:27 +08:00
a36fe34eab Merge remote-tracking branch 'origin/develop' into feature/hant 2025-04-08 20:47:45 +08:00
zhuyu
cf1b76c0ab Accept Merge Request #16: (feature/zy -> develop)
Merge Request: feature: task

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/16?initial=true
2025-04-07 09:25:32 +08:00
zhuyu
0c557472c7 feature: task 2025-04-06 15:32:08 +08:00
zhuyu
a3629141d3 feature: task 2025-04-06 13:41:02 +08:00
ed63962d56 派单员添加区域过滤 2025-04-02 22:43:14 +08:00
cee37cad21 订单数据 2025-04-01 23:03:44 +08:00
0a333ab742 Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	composer.json
#	composer.lock
2025-04-01 20:32:13 +08:00
xman
ee367f5a76 record 2025-04-01 18:19:15 +08:00
xman
8cce217fa1 record 2025-04-01 17:20:53 +08:00
bbde06adb1 识别 2025-04-01 17:20:28 +08:00
xman
7305d49275 record 2025-04-01 17:19:45 +08:00
xman
d037ec193d record 2025-04-01 17:19:25 +08:00
xman
c5db908603 hook 2025-04-01 15:46:37 +08:00
xman
066c6fb584 text 2025-03-31 14:15:54 +08:00
xman
a36fd9805f 回访 2025-03-31 10:53:47 +08:00
zhuyu
7e535c03b0 feature: task 2025-03-30 17:59:00 +08:00
zhuyu
b5c32bb8ad Merge branch 'develop' into feature/zy 2025-03-30 16:54:49 +08:00
e52eb48f0b 自动派单 2025-03-30 15:55:20 +08:00
xman
09e94cd7b3 配置订单 2025-03-29 21:40:16 +08:00
xman
d3d63f4872 修改派单 2025-03-29 20:54:18 +08:00
2b32306511 添加管理员区域配置 2025-03-29 19:05:22 +08:00
zhuyu
a41e1e5408 feature: task 2025-03-28 11:11:22 +08:00
xman
8b72f9b5ec 配置订单 2025-03-27 21:31:55 +08:00
xman
6f9052e0fc 配置订单 2025-03-27 21:27:44 +08:00
xman
f9a6d1aa62 配置订单 2025-03-27 21:00:27 +08:00
xman
61e69718df 配置订单 2025-03-27 20:57:41 +08:00
xman
66407c5adf 配置订单 2025-03-27 20:49:09 +08:00
xman
e445d84761 配置订单 2025-03-27 17:18:28 +08:00
xman
42be630a28 任务完成 2025-03-27 16:28:22 +08:00
xman
2e9bd0d804 cancel任务 2025-03-27 14:56:07 +08:00
xman
80a65b325f cancel任务 2025-03-27 14:33:49 +08:00
xman
4c26d857e8 sth 2025-03-26 20:12:03 +08:00
zhuyu
df0aae4a22 feature: task 2025-03-26 14:24:42 +08:00
zhuyu
e281b3c65f feature: task 2025-03-25 18:20:03 +08:00
zhuyu
7b268b1b84 feature: task 2025-03-25 15:46:52 +08:00
xman
d986cd7b69 sth 2025-03-25 09:22:41 +08:00
xman
8c4ce33384 sth 2025-03-24 21:40:45 +08:00
zhuyu
50e27370dd feature: task 2025-03-24 18:09:16 +08:00
zhuyu
d7462f828f Merge branch 'develop' into feature/zy 2025-03-24 09:50:42 +08:00
10760ed9d0 添加订单 2025-03-23 18:19:34 +08:00
zhuyu
a051e4136f feature: task 2025-03-22 18:47:00 +08:00
zhuyu
30ecfd1f65 feature: task 2025-03-22 18:24:24 +08:00
xman
d08bbb1c7f sth 2025-03-21 22:55:48 +08:00
zhuyu
f8b0af6057 feature: task 2025-03-21 17:56:26 +08:00
zhuyu
f3ee736f1c feature: task 2025-03-21 17:55:41 +08:00
xman
e6449c37fb sth 2025-03-20 21:53:36 +08:00
xman
71d5546148 sth 2025-03-20 21:39:38 +08:00
f6e39867df 派单 2025-03-14 20:33:29 +08:00
2369446995 派单 2025-03-14 19:19:31 +08:00
bf4d2cf9ee 派单 2025-03-14 18:22:34 +08:00
b572345345 派单 2025-03-13 18:00:44 +08:00
e1a30208b9 派单逻辑 2025-03-11 23:20:44 +08:00
3e780bf5c6 添加地区筛选 2025-03-10 23:07:20 +08:00
zhuyu
bf23a69626 feature: task 2025-03-10 22:04:09 +08:00
d028613923 Accept Merge Request #10: (feature/hant -> develop)
Merge Request: 工人录入

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/10?initial=true
2025-03-10 20:31:59 +08:00
9b04e4d9a0 工人录入 2025-03-10 20:30:39 +08:00
xman
74da2843ad sth 2025-03-10 17:53:16 +08:00
93fb6a1b9c Accept Merge Request #9: (feature/hant -> develop)
Merge Request: 城市选择

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/9?initial=true
2025-03-10 15:51:29 +08:00
dc60813220 城市选择 2025-03-10 15:49:47 +08:00
xman
a7eb4f5615 Merge branch 'feature/xman' into develop 2025-03-10 15:37:42 +08:00
xman
b00990ebe9 sth 2025-03-10 15:35:36 +08:00
738f3973d6 Accept Merge Request #8: (feature/hant -> develop)
Merge Request: 黑明单管理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/8
2025-03-10 15:28:44 +08:00