Commit Graph

100 Commits

Author SHA1 Message Date
808c8801d3 Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/admin/controller/orders/Dispatch2.php
2025-06-16 20:59:45 +08:00
xman
dba8e571fc 三级筛选 2025-06-16 17:34:18 +08:00
xman
754621ecac 三级筛选 2025-06-16 17:30:21 +08:00
xman
aff4782cea 三级筛选 2025-06-16 17:28:03 +08:00
xman
d6e2ce6d93 sb 2025-06-16 15:46:13 +08:00
xman
2d871656ac sb 2025-06-16 14:43:25 +08:00
d0938fc804 问题修复 2025-06-15 18:34:41 +08:00
xman
165a310a33 sb 2025-06-12 21:56:53 +08:00
xman
6050417c47 sb 2025-06-12 21:51:37 +08:00
xman
641fe883fc sb 2025-06-12 21:26:00 +08:00
xman
b6d4a5661d sb 2025-06-12 21:24:27 +08:00
fe115b963e 处理错误 2025-06-05 22:01:14 +08:00
2a068d2ee6 修改 2025-06-05 18:05:12 +08:00
7da4aeb708 修改 2025-06-04 14:21:00 +08:00
2e4ddc3f61 关闭 call 2025-06-04 10:47:13 +08:00
e2842bf17c 修改 2025-06-03 15:39:35 +08:00
xman
51b3dec40c 完成订单重构 2025-06-02 15:12:41 +08:00
xman
5a6642ea1f 完成订单重构 2025-06-02 13:55:57 +08:00
xman
ddffac5b74 完成订单重构 2025-06-02 12:56:21 +08:00
xman
4874a8cae8 完成订单重构 2025-06-02 12:52:52 +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
26cd36e2ec 跟进重构 2025-05-31 18:07:49 +08:00
xman
21dbd1d5a5 跟进重构 2025-05-31 17:04:59 +08:00
xman
62dbe6a876 default 2025-05-31 15:33:22 +08:00
aab0299d15 修改 2025-05-28 23:47:46 +08:00
c6979b7129 派单地图 2025-05-24 19:07:07 +08:00
fc4f74704b map 2025-05-23 18:05:28 +08:00
ebb015b51c 派单地图dome 2025-05-21 23:33:43 +08:00
98865bd1b6 bug 修复 2025-05-20 23:17:56 +08:00
xman
8ba818b8f5 sth 2025-05-19 14:52: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
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
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
64b2c282ff sth 2025-04-17 10:14:26 +08:00
xman
dd67cb9d13 添加日志 2025-04-15 17:58:27 +08:00