Commit Graph

211 Commits

Author SHA1 Message Date
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
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
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
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