hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,188 Commits 6 Branches 0 Tags 33 MiB
246ebb7717
Commit Graph

592 Commits

Author SHA1 Message Date
todaywindy
e9dce2407d 修改 2025-06-26 14:27:15 +08:00
zhuyu
e2a359399a Accept Merge Request #183: (feature/zy -> develop) 
Merge Request: feature: kpi

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/183
 2025-06-25 18:02:53 +08:00
zhuyu
1ae192cf69 feature: kpi 2025-06-25 18:01:08 +08:00
todayswind
30658e9bb6 Accept Merge Request #181: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/181?initial=true
 2025-06-25 11:48:56 +08:00
todaywindy
7dd30af6ad 修改 2025-06-25 11:47:43 +08:00
zhuyu
ddf7720aab feature: 排班表 2025-06-25 11:07:33 +08:00
zhuyu
d6adb76d79 feature: 排班表 2025-06-25 11:07:24 +08:00
zhuyu
bc3cf6a8f6 feature: 排班表 2025-06-25 11:04:51 +08:00
zhuyu
c9411815dd feature: 权限 2025-06-25 10:57:07 +08:00
zhuyu
81bc56f571 feature: 组筛选 2025-06-24 17:59:12 +08:00
todayswind
b3aaff2238 Accept Merge Request #178: (feature/hant -> develop) 
Merge Request: 取消订单日志

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/178?initial=true
 2025-06-24 15:07:58 +08:00
todaywindy
c39e3c01da 取消订单日志 2025-06-24 14:53:07 +08:00
todayswind
1cbb5628c6 Accept Merge Request #176: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/176?initial=true
 2025-06-23 14:28:05 +08:00
todaywindy
3f12333026 修改 2025-06-23 14:27:19 +08:00
todayswind
e8fec5fb6a Accept Merge Request #175: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/175?initial=true
 2025-06-23 11:54:33 +08:00
todaywindy
968fc2cc8e 修改 2025-06-23 11:51:28 +08:00
zhuyu
767b033647 Accept Merge Request #174: (feature/zy -> develop) 
Merge Request: feature: gzt

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/174
 2025-06-23 11:40:12 +08:00
zhuyu
3c1ba87518 feature: gzt 2025-06-23 11:39:04 +08:00
todaywindy
a54769e075 修改 2025-06-23 10:31:49 +08:00
todayswind
e4ce0feef3 Accept Merge Request #168: (feature/hant -> develop) 
Merge Request: 退单统计

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/168?initial=true
 2025-06-22 18:42:28 +08:00
hant
02dbc1233a 退单统计 2025-06-22 18:41:46 +08:00
xman
b4fe76cb3c sth 2025-06-22 18:29:19 +08:00
xman
f1957a347b sth 2025-06-22 18:13:05 +08:00
hant
2b209eef1e 创建分类 2025-06-22 16:38:09 +08:00
hant
370f9ec304 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-06-21 19:47:43 +08:00
hant
01dd67db11 创建分类 2025-06-21 19:47:34 +08:00
xman
bceea13d7e Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 16:52:56 +08:00
xman
f7a32b9321 sth 2025-06-20 16:52:35 +08:00
todayswind
cd4a63e381 Accept Merge Request #163: (feature/hant -> develop) 
Merge Request: 添加搜索以及退款信息

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/163?initial=true
 2025-06-20 16:49:36 +08:00
todaywindy
7fa8e964c9 添加搜索以及退款信息 2025-06-20 16:48:41 +08:00
xman
10cff56e96 Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 16:14:27 +08:00
xman
f776e55756 sth 2025-06-20 16:14:03 +08:00
zhuyu
0cdfb5576b Accept Merge Request #162: (feature/zy -> develop) 
Merge Request: feature: 权限

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/162?initial=true
 2025-06-20 16:06:03 +08:00
zhuyu
344466f013 feature: 权限 2025-06-20 16:04:52 +08:00
xman
f85c2988ca Merge remote-tracking branch 'origin/develop' into develop 2025-06-20 15:48:32 +08:00
xman
9953cbcfac sth 2025-06-20 15:48:11 +08:00
zhuyu
873f4896fb Accept Merge Request #160: (feature/zy -> develop) 
Merge Request: feature: 权限

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/160
 2025-06-20 15:38:06 +08:00
zhuyu
6acfd4b6e4 feature: 权限 2025-06-20 15:37:07 +08:00
xman
bc9aa3fb57 sth 2025-06-19 15:20:46 +08:00
xman
d73e008d58 sth 2025-06-19 14:57:51 +08:00
xman
8c42814d5e sth 2025-06-19 09:35:18 +08:00
todaywindy
b3ba64a651 添加消息 2025-06-18 16:49:05 +08:00
todayswind
4f703b57a7 Accept Merge Request #155: (feature/hant -> develop) 
Merge Request: 派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/155?initial=true
 2025-06-18 11:15:46 +08:00
todaywindy
cf2fa22190 派单 2025-06-18 11:14:55 +08:00
todayswind
af251b9d37 Accept Merge Request #154: (feature/hant -> develop) 
Merge Request: 地图派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/154?initial=true
 2025-06-18 10:16:24 +08:00
todaywindy
0103120071 地图派单 2025-06-18 10:14:29 +08:00
xman
c1d6259bc9 sth 2025-06-18 10:08:42 +08:00
hant
e21d9d615c 地区搜索 2025-06-17 23:07:17 +08:00
hant
3d46ec1ee0 问题修复 2025-06-17 21:50:04 +08:00
todaywindy
4b1ade55b8 取消订单问题 2025-06-17 17:11:28 +08:00
xman
4c7101ab80 sth 2025-06-17 15:34:28 +08:00
xman
6b4af27857 sth 2025-06-17 15:23:00 +08:00
xman
d0efa47ab3 sth 2025-06-17 15:22:26 +08:00
xman
ace5bd7f36 sth 2025-06-17 15:04:33 +08:00
hant
a00c55b8ee Merge remote-tracking branch 'origin/develop' into feature/hant 2025-06-16 23:12:12 +08:00
hant
f78d784441 问题修复 2025-06-16 23:12:01 +08:00
xman
18e48f793b 地址 2025-06-16 22:20:40 +08:00
xman
5b4c2994c9 地址 2025-06-16 21:56:43 +08:00
xman
797c093b63 地址 2025-06-16 21:44:05 +08:00
xman
e5f0572c3f 地址 2025-06-16 21:39:47 +08:00
xman
e24f5f0449 地址 2025-06-16 21:23:52 +08:00
xman
a02eaeb3a8 地址 2025-06-16 21:21:46 +08:00
hant
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
802a14cda5 地址 2025-06-16 18:16:10 +08:00
xman
e9e5ad25a0 三级筛选 2025-06-16 17:58:33 +08:00
xman
e3bab20f7b 三级筛选 2025-06-16 17:44:03 +08:00
xman
0718b4626c 三级筛选 2025-06-16 17:39:14 +08:00
xman
dba8e571fc 三级筛选 2025-06-16 17:34:18 +08:00
xman
aff4782cea 三级筛选 2025-06-16 17:28:03 +08:00
xman
5896d2171e sb 2025-06-16 16:35:02 +08:00
xman
2d871656ac sb 2025-06-16 14:43:25 +08:00
xman
bcef5370b8 sb 2025-06-16 13:49:35 +08:00
xman
25a38ed146 sb 2025-06-16 13:44:20 +08:00
hant
d0938fc804 问题修复 2025-06-15 18:34:41 +08:00
hant
e5ffa674b0 录入订单 2025-06-14 15:00:27 +08:00
todayswind
d17042ad46 Accept Merge Request #144: (feature/hant -> develop) 
Merge Request: 查看自己的消息

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/144?initial=true
 2025-06-13 14:59:06 +08:00
todaywindy
4a1f5d79c7 查看自己的消息 2025-06-13 09:53:17 +08:00
xman
6050417c47 sb 2025-06-12 21:51:37 +08:00
xman
70ca003e1b sb 2025-06-12 21:26:26 +08:00
xman
b6d4a5661d sb 2025-06-12 21:24:27 +08:00
todaywindy
65d22c70da 订单优化 2025-06-11 20:00:27 +08:00
todaywindy
90c3c4ba25 订单优化 2025-06-11 17:14:31 +08:00
hant
66c9dcdc7d 自动识别 2025-06-10 23:38:38 +08:00
todaywindy
3edb2386a9 订单优化 2025-06-10 16:15:40 +08:00
todaywindy
846a9eb809 燕国地图修改 2025-06-10 14:06:49 +08:00
todaywindy
a2ee16a277 订单 2025-06-10 10:45:13 +08:00
hant
726c14bae0 优化 2025-06-09 23:16:58 +08:00
gcd
ab72846005 Merge branch 'develop' of e.coding.net:g-bcrc3009/allocatr/allocatr into feature/dgg 2025-06-08 23:02:53 +08:00
gcd
2785532d4f feat: 后台复制订单页面调整 2025-06-08 23:02:15 +08:00
gcd
4c32627276 feat: 后台修改订单页面调整 2025-06-08 22:44:05 +08:00
gcd
463240df80 feat: 后台订单录入页面调整 2025-06-08 18:16:11 +08:00
xman
f87648c09b 通知 2025-06-08 11:54:14 +08:00
hant
0588b2191b 订单状态修改 2025-06-07 19:39:59 +08:00
hant
6dc5156074 订单录入bug 2025-06-07 19:22:07 +08:00
xman
9e4411532c 通知 2025-06-07 17:55:32 +08:00
xman
bf5a52b454 通知 2025-06-06 20:30:32 +08:00
xman
8fe7bacbac 通知 2025-06-06 20:23:05 +08:00
xman
fbae7efd98 通知 2025-06-06 19:57:56 +08:00
zhuyu
aa2bbdee0c feature: kpi dash 2025-06-05 23:26:21 +08:00
hant
5c613b9cee 处理错误 2025-06-05 22:17:37 +08:00
hant
7536a6d7cc Merge remote-tracking branch 'origin/develop' into feature/hant 
# Conflicts:
#	application/admin/controller/AutoDispatchLogic.php
#	application/common/Logic/OrderLogic.php
 2025-06-05 22:14:46 +08:00
hant
fe115b963e 处理错误 2025-06-05 22:01:14 +08:00
xman
4d8e3f6986 通知 2025-06-05 21:53:08 +08:00
xman
6ae3d1e163 通知 2025-06-05 21:47:43 +08:00
xman
8e581e07c1 通知 2025-06-05 21:35:34 +08:00
xman
863a6621fd 通知 2025-06-05 21:27:47 +08:00
hant
abdfa0bc28 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-06-05 21:16:33 +08:00
xman
0548036735 通知 2025-06-05 21:15:41 +08:00
hant
bdc0ff111e Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-06-05 20:23:29 +08:00
todaywindy
2a068d2ee6 修改 2025-06-05 18:05:12 +08:00
zhuyu
3690076503 Accept Merge Request #115: (feature/zy -> develop) 
Merge Request: feature: 复制

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/115
 2025-06-05 15:54:40 +08:00
zhuyu
65fe19b15a feature: 复制 2025-06-05 15:53:36 +08:00
zhuyu
665d273459 feature: 添加工资表 2025-06-05 15:46:42 +08:00
zhuyu
186fbca2d1 feature: 批量添加任务 2025-06-05 15:23:05 +08:00
zhuyu
69ebde0732 feature: 任务复制 2025-06-05 15:16:09 +08:00
todaywindy
c02fff7530 修改 2025-06-05 10:31:37 +08:00
xman
5a0a2dc731 通知 2025-06-05 09:27:42 +08:00
todayswind
77f2c32ed7 Accept Merge Request #112: (feature/hant -> develop) 
Merge Request: 自动派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/112?initial=true
 2025-06-04 21:48:38 +08:00
hant
d1a8960ef6 自动派单 2025-06-04 21:47:59 +08:00
xman
3cac6fd6fe 通知 2025-06-04 20:59:13 +08:00
xman
459f094718 通知 2025-06-04 20:48:44 +08:00
xman
10412e6596 通知 2025-06-04 11:10:59 +08:00
zhuyu
d842125c88 Accept Merge Request #107: (feature/zy -> develop) 
Merge Request: feature: auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/107
 2025-06-04 10:18:50 +08:00
zhuyu
cc4180b27d feature: auth 2025-06-04 10:17:35 +08:00
zhuyu
9fefc01a25 Accept Merge Request #106: (feature/zy -> develop) 
Merge Request: feature: auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/106
 2025-06-04 10:08:59 +08:00
zhuyu
28f3154a9e feature: auth 2025-06-04 10:06:46 +08:00
zhuyu
b990c5d62a feature: auth 2025-06-04 09:59:37 +08:00
zhuyu
716a84303c Accept Merge Request #105: (feature/zy -> develop) 
Merge Request: feature: auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/105
 2025-06-04 09:30:06 +08:00
zhuyu
a339bdf316 feature: auth 2025-06-04 09:29:26 +08:00
zhuyu
32848f79e8 feature: 按钮名称 2025-06-04 09:26:37 +08:00
zhuyu
58f6fee9ad Accept Merge Request #104: (feature/zy -> develop) 
Merge Request: feature: auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/104
 2025-06-04 09:21:41 +08:00
zhuyu
4ead5dab34 feature: auth 2025-06-04 09:21:04 +08:00
zhuyu
5d71637a0d Accept Merge Request #103: (feature/zy -> develop) 
Merge Request: feature: salary menu

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/103
 2025-06-03 23:32:26 +08:00
zhuyu
45172a0f6d feature: salary menu 2025-06-03 23:31:46 +08:00
zhuyu
673751c5bd feature: salary menu 2025-06-03 23:29:10 +08:00
zhuyu
663c4317ef Accept Merge Request #102: (feature/zy -> develop) 
Merge Request: feature: salary menu

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/102
 2025-06-03 23:22:36 +08:00
zhuyu
b456b03c06 feature: salary menu 2025-06-03 23:21:49 +08:00
zhuyu
f1af5c7930 Accept Merge Request #101: (feature/zy -> develop) 
Merge Request: feature: salary auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/101
 2025-06-03 22:56:38 +08:00
zhuyu
5f2033f90c feature: salary auth 2025-06-03 22:55:52 +08:00
zhuyu
049f771ce4 feature: salary auth 2025-06-03 22:52:28 +08:00
zhuyu
0f7cdc61a9 Accept Merge Request #100: (feature/zy -> develop) 
Merge Request: feature: 按钮名称

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/100
 2025-06-03 18:07:12 +08:00
zhuyu
cf39aa4326 feature: 按钮名称 2025-06-03 18:06:40 +08:00
zhuyu
998cb993e4 Accept Merge Request #99: (feature/zy -> develop) 
Merge Request: feature: 按钮名称

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/99
 2025-06-03 17:48:26 +08:00
zhuyu
ee2d779f71 feature: 按钮名称 2025-06-03 17:29:50 +08:00
todaywindy
98ab885f28 修改 2025-06-03 16:40:39 +08:00
todaywindy
e2842bf17c 修改 2025-06-03 15:39:35 +08:00
todaywindy
41dd493e57 修改 2025-06-03 11:51:01 +08:00
xman
25adfb36fc 通知 2025-06-02 20:48:01 +08:00
xman
1e13c81f16 通知 2025-06-02 20:45:29 +08:00
xman
68f629d74b 通知 2025-06-02 20:26:56 +08:00