Commit Graph

209 Commits

Author SHA1 Message Date
xman
acfb1a7371 审核 2025-04-19 21:27:54 +08:00
69642477be 调整 2025-04-19 17:52:55 +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
fb99b2dbe6 审核 2025-04-18 16:54:52 +08:00
xman
bb80209ffb cmd 2025-04-18 16:37:28 +08:00
xman
c700360d48 cmd 2025-04-18 15:10:18 +08:00
xman
a45046c5f0 cmd 2025-04-18 15:09:26 +08:00
xman
88aa8696ab aftersale 2025-04-18 14:28:38 +08:00
xman
d3d4f6c2e9 aftersale 2025-04-18 14:22:46 +08:00
xman
9774fb8385 aftersale 2025-04-18 13:55:09 +08:00
xman
02fe2e32d8 aftersale 2025-04-18 13:39:04 +08:00
xman
d3f794a517 aftersale 2025-04-18 13:38:30 +08:00
xman
480e7361a9 aftersale 2025-04-18 13:37:53 +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
dcc87b85ec sth 2025-04-17 17:38:54 +08:00
xman
5417d0daa9 sth 2025-04-17 17:30:29 +08:00
xman
c80bd8aacb sth 2025-04-17 17:04:58 +08:00
xman
d598ecbde2 sth 2025-04-17 16:59:47 +08:00
xman
3af4172660 sth 2025-04-17 16:55:10 +08:00
1ac760222c 开票 2025-04-17 11:17:40 +08:00
a916c55786 开票 2025-04-16 17:51:41 +08:00
xman
5bce8cf36c sth 2025-04-16 10:27:30 +08:00
xman
850c962340 添加日志 2025-04-14 15:52:54 +08:00
xman
b907583658 添加日志 2025-04-14 11:28:10 +08:00
xman
b042e4904c 添加日志 2025-04-14 10:44:19 +08:00
xman
4da8536a47 添加日志 2025-04-14 10:32:08 +08:00
xman
25f1c91271 添加日志 2025-04-14 10:28:53 +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
fad7b7d4a3 feature: task 2025-04-06 14:10:46 +08:00
zhuyu
a89e298e88 feature: task 2025-04-06 14:05:52 +08:00
zhuyu
0bd41bfb0f feature: task 2025-04-06 13:58:37 +08:00
zhuyu
a3629141d3 feature: task 2025-04-06 13:41:02 +08:00
ed63962d56 派单员添加区域过滤 2025-04-02 22:43:14 +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
bbde06adb1 识别 2025-04-01 17:20:28 +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
24dc01baf3 hook 2025-03-31 15:52:30 +08:00
xman
501b1a7bde text 2025-03-31 14:27:41 +08:00
xman
066c6fb584 text 2025-03-31 14:15:54 +08:00
xman
65aea57786 dispatch 增加变更日志 2025-03-31 11:33:44 +08:00
xman
b77ccfe5f8 dispatch 增加变更日志 2025-03-31 11:28:33 +08:00
xman
7a4bafcc12 dispatch 日志 2025-03-31 11:15:08 +08:00
xman
86a1df86de 配置订单权限 2025-03-31 10:48:39 +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
e8a7dbddc3 订单数据 2025-03-30 16:29:32 +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
6f9052e0fc 配置订单 2025-03-27 21:27:44 +08:00
xman
66407c5adf 配置订单 2025-03-27 20:49:09 +08:00
xman
39bee27491 配置订单 2025-03-27 20:24:52 +08:00
xman
2c9c5bd894 配置订单 2025-03-27 17:32:06 +08:00
xman
dc1c098acc 配置订单 2025-03-27 17:29:51 +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
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
c5a37912c0 feature: task 2025-03-24 11:44:35 +08:00
zhuyu
d7462f828f Merge branch 'develop' into feature/zy 2025-03-24 09:50:42 +08:00
zhuyu
4a00bf7b5f feature: task 2025-03-23 22:10:20 +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
bf4d2cf9ee 派单 2025-03-14 18:22:34 +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
xman
d81a1a14b7 Merge branch 'feature/xman' into develop 2025-03-10 17:06:52 +08:00