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

410 Commits

Author SHA1 Message Date
todaywindy
65d22c70da 订单优化 2025-06-11 20:00:27 +08:00
todaywindy
3d57e6cce1 订单优化 2025-06-11 18:22:38 +08:00
todaywindy
2e1ce5cb57 订单优化 2025-06-11 17:47:30 +08:00
todaywindy
90c3c4ba25 订单优化 2025-06-11 17:14:31 +08:00
hant
66c9dcdc7d 自动识别 2025-06-10 23:38:38 +08:00
todaywindy
3b5e2a8a29 订单优化 2025-06-10 16:42:30 +08:00
todaywindy
3edb2386a9 订单优化 2025-06-10 16:15:40 +08:00
todaywindy
be4df03f64 搜索 2025-06-10 15:54:36 +08:00
todaywindy
846a9eb809 燕国地图修改 2025-06-10 14:06:49 +08:00
hant
726c14bae0 优化 2025-06-09 23:16:58 +08:00
gcd
59303bac7a feat: 后台复制订单页面调整 2025-06-08 23:31:39 +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
cb6c595c8f feat: 后台订单录入页面调整 2025-06-08 21:12:46 +08:00
hant
6dc5156074 订单录入bug 2025-06-07 19:22:07 +08:00
hant
021225c57f 订单录入bug 2025-06-07 19:04:44 +08:00
xman
fbae7efd98 通知 2025-06-06 19:57:56 +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
89168202b2 处理错误 2025-06-05 22:12:24 +08:00
hant
fe115b963e 处理错误 2025-06-05 22:01:14 +08:00
xman
4d8e3f6986 通知 2025-06-05 21:53:08 +08:00
xman
c0a7b7d7e8 通知 2025-06-05 21:33:40 +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
69ebde0732 feature: 任务复制 2025-06-05 15:16:09 +08:00
todaywindy
c02fff7530 修改 2025-06-05 10:31:37 +08:00
todaywindy
7da4aeb708 修改 2025-06-04 14:21:00 +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
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
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
todaywindy
e2842bf17c 修改 2025-06-03 15:39:35 +08:00
xman
1e13c81f16 通知 2025-06-02 20:45:29 +08:00
xman
433f3bbce4 通知 2025-06-02 20:25:31 +08:00
todayswind
5f8a2feac1 Accept Merge Request #96: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/96?initial=true
 2025-06-02 19:03:54 +08:00
hant
b96fc31bc6 修改 2025-06-02 19:03:16 +08:00
xman
c5cd79edd5 上门前提醒 2025-06-02 18:37:32 +08:00
xman
c1ac4bf315 sth 2025-06-02 15:19:53 +08:00
xman
5a6642ea1f 完成订单重构 2025-06-02 13:55:57 +08:00
xman
7a6bc2940a 完成订单重构 2025-06-02 12:59:30 +08:00
xman
9c32d4ba72 完成订单重构 2025-06-02 12:59:07 +08:00
zhuyu
a31f337a65 feature: task notice 2025-06-02 12:15:32 +08:00
zhuyu
fbdc9c8aba feature: task notice 2025-06-02 12:11:31 +08:00
zhuyu
b8313ec13a feature: task notice 2025-06-02 12:08:46 +08:00
zhuyu
3c1221db58 feature: taskk 2025-06-02 11:53:21 +08:00
zhuyu
ca93a9e071 Accept Merge Request #91: (feature/zy -> develop) 
Merge Request: feature: taskk

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/91?initial=true
 2025-06-02 11:18:14 +08:00
zhuyu
059cee2313 feature: taskk 2025-06-02 11:17:51 +08:00
xman
0360e5c29a Merge branch 'develop' of https://e.coding.net/g-bcrc3009/allocatr/allocatr into develop 2025-06-01 22:49:55 +08:00
xman
dc2a71949e 完成订单重构 2025-06-01 22:41:54 +08:00
todayswind
03c72b86ad Accept Merge Request #90: (feature/hant -> develop) 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/90?initial=true
 2025-06-01 22:36:38 +08:00
hant
2ab964b734 修改 2025-06-01 22:35:42 +08:00
xman
d5050f0dd0 完成订单重构 2025-06-01 22:28:02 +08:00
xman
7e1abeb449 完成订单重构 2025-06-01 17:32:26 +08:00
xman
51d72bc25d 完成订单重构 2025-06-01 17:30:48 +08:00
xman
d19845a072 完成订单重构 2025-06-01 17:27:19 +08:00
xman
761ba043c2 完成订单重构 2025-06-01 16:29:36 +08:00
xman
12fd8dd404 完成订单重构 2025-06-01 16:22:35 +08:00
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
todayswind
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
hant
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
hant
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
todaywindy
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
hant
f74fc4e153 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-05-29 21:31:57 +08:00
todaywindy
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