Commit Graph

390 Commits

Author SHA1 Message Date
xman
56049e89be sth 2025-06-18 14:52:45 +08:00
xman
51a42a9b25 sth 2025-06-18 12:00:10 +08:00
xman
70b1ff8ce7 sth 2025-06-18 11:21:48 +08:00
d9b6788c22 订单问题 2025-06-18 09:39:43 +08:00
e21d9d615c 地区搜索 2025-06-17 23:07:17 +08:00
a00c55b8ee Merge remote-tracking branch 'origin/develop' into feature/hant 2025-06-16 23:12:12 +08:00
f78d784441 问题修复 2025-06-16 23:12:01 +08:00
xman
e5f0572c3f 地址 2025-06-16 21:39:47 +08:00
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
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
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
c949340c04 订单优化 2025-06-11 18:30:18 +08:00
90c3c4ba25 订单优化 2025-06-11 17:14:31 +08:00
66c9dcdc7d 自动识别 2025-06-10 23:38:38 +08:00
f152675253 自动填充 2025-06-10 14:45:52 +08:00
846a9eb809 燕国地图修改 2025-06-10 14:06:49 +08:00
726c14bae0 优化 2025-06-09 23:16:58 +08:00
苟川东
4236f4e93e feat: 后台录单区域基于显示器居中 2025-06-09 15:46:06 +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
gcd
463240df80 feat: 后台订单录入页面调整 2025-06-08 18:16:11 +08:00
021225c57f 订单录入bug 2025-06-07 19:04:44 +08:00
zhuyu
aa2bbdee0c feature: kpi dash 2025-06-05 23:26:21 +08:00
fe115b963e 处理错误 2025-06-05 22:01:14 +08:00
bdc0ff111e Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-06-05 20:23:29 +08:00
2a068d2ee6 修改 2025-06-05 18:05:12 +08:00
zhuyu
0b30e8dc52 Accept Merge Request #116: (feature/zy -> develop)
Merge Request: feature: 样式

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/116
2025-06-05 17:05:45 +08:00
zhuyu
c745a00be8 feature: 样式 2025-06-05 17:04:59 +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
186fbca2d1 feature: 批量添加任务 2025-06-05 15:23:05 +08:00
zhuyu
69ebde0732 feature: 任务复制 2025-06-05 15:16:09 +08:00
7da4aeb708 修改 2025-06-04 14:21:00 +08:00
f0806e7cfc Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/common/Logic/NoticeLogic.php
2025-06-04 10:49:13 +08:00
2e4ddc3f61 关闭 call 2025-06-04 10:47:13 +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
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
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
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
e2842bf17c 修改 2025-06-03 15:39:35 +08:00
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
433f3bbce4 通知 2025-06-02 20:25:31 +08:00
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
b96fc31bc6 修改 2025-06-02 19:03:16 +08:00
xman
c5cd79edd5 上门前提醒 2025-06-02 18:37:32 +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
1db3b3c9fd 完成订单重构 2025-06-01 23:18:37 +08:00
xman
2bdb613f78 完成订单重构 2025-06-01 23:09:27 +08:00
xman
66a9589b7a 完成订单重构 2025-06-01 23:06:38 +08:00
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
2ab964b734 修改 2025-06-01 22:35:42 +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
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
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
995d06ea1d 修改 2025-05-31 17:48:26 +08:00
xman
21dbd1d5a5 跟进重构 2025-05-31 17:04:59 +08:00
xman
62dbe6a876 default 2025-05-31 15:33:22 +08:00
222a19a331 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-05-31 14:39:59 +08:00
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
zhuyu
886801637b feature: 按钮名称 2025-05-30 15:24:05 +08:00
f74fc4e153 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-05-29 21:31:57 +08:00
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
448e878813 feature: 工资管理 2025-05-29 15:30:21 +08:00
zhuyu
c7ee06d512 feature: 工资管理 2025-05-29 11:57:45 +08:00
aab0299d15 修改 2025-05-28 23:47:46 +08:00
e86888fbc6 订单异常 2025-05-28 20:27:25 +08:00
zhuyu
10fcccf53a feature: 面板 2025-05-28 17:30:03 +08:00