Commit Graph

794 Commits

Author SHA1 Message Date
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
754621ecac 三级筛选 2025-06-16 17:30:21 +08:00
xman
aff4782cea 三级筛选 2025-06-16 17:28:03 +08:00
xman
5896d2171e sb 2025-06-16 16:35:02 +08:00
xman
d6e2ce6d93 sb 2025-06-16 15:46:13 +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
d0938fc804 问题修复 2025-06-15 18:34:41 +08:00
19ab64c109 智能识别 2025-06-14 18:03:47 +08:00
e5ffa674b0 录入订单 2025-06-14 15:00:27 +08:00
大狗哥
f4ffaabbfc Accept Merge Request #145: (feature/dgg -> develop)
Merge Request: feat: 【小程序】修改服务过程中日志文案

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/145?initial=true
2025-06-13 17:28:04 +08:00
苟川东
e716c205c6 feat: 【小程序】修改服务过程中日志文案 2025-06-13 17:27:43 +08:00
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
4a1f5d79c7 查看自己的消息 2025-06-13 09:53:17 +08:00
xman
c4e5d66cd7 sb 2025-06-13 09:40:06 +08:00
xman
17dcdd4c06 sb 2025-06-13 09:30:54 +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
70ca003e1b sb 2025-06-12 21:26:26 +08:00
xman
641fe883fc sb 2025-06-12 21:26:00 +08:00
xman
b6d4a5661d sb 2025-06-12 21:24:27 +08:00
c5738d7dc1 Accept Merge Request #143: (feature/hant -> develop)
Merge Request: 鞭策牛马

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/143?initial=true
2025-06-12 17:20:22 +08:00
57c0c44c3d 鞭策牛马 2025-06-12 17:19:04 +08:00
cc3ff1e900 鞭策牛马 2025-06-12 17:12:37 +08:00
xman
779888ec07 Merge remote-tracking branch 'origin/develop' into develop 2025-06-12 17:00:35 +08:00
xman
cc4a15e2fe 通知 2025-06-12 17:00:14 +08:00
65d22c70da 订单优化 2025-06-11 20:00:27 +08:00
c949340c04 订单优化 2025-06-11 18:30:18 +08:00
3d57e6cce1 订单优化 2025-06-11 18:22:38 +08:00
90c3c4ba25 订单优化 2025-06-11 17:14:31 +08:00
66c9dcdc7d 自动识别 2025-06-10 23:38:38 +08:00
144cffc034 Accept Merge Request #136: (feature/hant -> develop)
Merge Request: 订单优化

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/136?initial=true
2025-06-10 16:17:09 +08:00
3edb2386a9 订单优化 2025-06-10 16:15:40 +08:00
大狗哥
476ba242c6 Accept Merge Request #133: (feature/dgg -> develop)
Merge Request: feat: 【小程序API】完成服务时,提交材料成本,同时写入到派单表。

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/133?initial=true
2025-06-10 15:38:17 +08:00
苟川东
fe75d35c08 feat: 【小程序API】完成服务时,提交材料成本,同时写入到派单表。 2025-06-10 15:37:56 +08:00
f152675253 自动填充 2025-06-10 14:45:52 +08:00
846a9eb809 燕国地图修改 2025-06-10 14:06:49 +08:00
a2ee16a277 订单 2025-06-10 10:45:13 +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
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
cb6c595c8f feat: 后台订单录入页面调整 2025-06-08 21:12:46 +08:00
gcd
463240df80 feat: 后台订单录入页面调整 2025-06-08 18:16:11 +08:00
897d5114fc 关闭等待 2025-06-08 14:54:11 +08:00
xman
f87648c09b 通知 2025-06-08 11:54:14 +08:00
gcd
e19188b046 feat: 修复项目报错 2025-06-07 21:47:03 +08:00
0588b2191b 订单状态修改 2025-06-07 19:39:59 +08:00
6dc5156074 订单录入bug 2025-06-07 19:22:07 +08:00
021225c57f 订单录入bug 2025-06-07 19:04:44 +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
xman
495c0e3f33 通知 2025-06-06 16:47:15 +08:00
xman
c9944b8b07 通知 2025-06-06 15:57:33 +08:00
xman
631cd00d17 通知 2025-06-06 15:57:18 +08:00
xman
696919950d 通知 2025-06-06 15:49:46 +08:00
zhuyu
aa2bbdee0c feature: kpi dash 2025-06-05 23:26:21 +08:00
xman
31a9a3ce0a 通知 2025-06-05 22:30:56 +08:00
5c613b9cee 处理错误 2025-06-05 22:17:37 +08:00
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
fe115b963e 处理错误 2025-06-05 22:01:14 +08:00
xman
14056b32ae 通知 2025-06-05 21:57:37 +08:00
xman
4d8e3f6986 通知 2025-06-05 21:53:08 +08:00
xman
6ae3d1e163 通知 2025-06-05 21:47:43 +08:00
xman
8a396cbccc 通知 2025-06-05 21:37:05 +08:00
xman
8e581e07c1 通知 2025-06-05 21:35:34 +08:00
xman
863a6621fd 通知 2025-06-05 21:27:47 +08:00
xman
fc07256ee5 通知 2025-06-05 21:26:46 +08:00
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
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
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
c02fff7530 修改 2025-06-05 10:31:37 +08:00
xman
5a0a2dc731 通知 2025-06-05 09:27:42 +08:00
cb5f55039c Accept Merge Request #113: (feature/hant -> develop)
Merge Request: 自动派单

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/113?initial=true
2025-06-04 21:49:48 +08:00
ca88afd647 自动派单 2025-06-04 21:49:32 +08:00
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
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
bc9c013b80 Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/extra/site.php
2025-06-04 14:23:31 +08:00
7da4aeb708 修改 2025-06-04 14:21:00 +08:00
zhuyu
d4d90ae5de Accept Merge Request #110: (feature/zy -> develop)
Merge Request: feature: 登录校验

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/110?initial=true
2025-06-04 14:20:28 +08:00
zhuyu
6b2ef44d68 feature: 登录校验 2025-06-04 14:19:36 +08:00
zhuyu
eb2d0a3f6b Accept Merge Request #109: (feature/zy -> develop)
Merge Request: Stop tracking site.php

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/109
2025-06-04 13:57:43 +08:00
xman
e53dc1bdd3 通知 2025-06-04 13:40:11 +08:00
xman
eae143512f 通知 2025-06-04 13:35:32 +08:00
zhuyu
318ced06a7 Stop tracking site.php 2025-06-04 13:34:19 +08:00
xman
10412e6596 通知 2025-06-04 11:10:59 +08:00
e9ad9e1a36 关闭 call 2025-06-04 10:50:41 +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
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
xman
e02deb601d 通知 2025-06-04 10:14:53 +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
137695c02a feature: salary menu 2025-06-03 23:30:42 +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
xman
47adcda018 通知 2025-06-03 17:00:32 +08:00
98ab885f28 修改 2025-06-03 16:40:39 +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
68f629d74b 通知 2025-06-02 20:26:56 +08:00
xman
433f3bbce4 通知 2025-06-02 20:25:31 +08:00
xman
f07ed061a8 通知 2025-06-02 19:24:42 +08:00
xman
79f6f4e821 通知 2025-06-02 19:24:15 +08:00
xman
612306d1d9 通知 2025-06-02 19:19:52 +08:00
xman
27959bda9a 接单成功 2025-06-02 19:14:22 +08:00
xman
17d9f68255 接单成功 2025-06-02 19:05:57 +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
282758e23a 接单成功 2025-06-02 18:53:03 +08:00
xman
b59216e941 接单成功 2025-06-02 18:46:56 +08:00
xman
2d866e0aac 上门前提醒 2025-06-02 18:40:17 +08:00
xman
77db49e9f6 Merge branch 'develop' of https://e.coding.net/g-bcrc3009/allocatr/allocatr into develop 2025-06-02 18:37:45 +08:00