Commit Graph

710 Commits

Author SHA1 Message Date
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
xman
c5cd79edd5 上门前提醒 2025-06-02 18:37:32 +08:00
zhuyu
ba6bf8ae65 Accept Merge Request #95: (feature/zy -> develop)
Merge Request: feature: task notice

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/95
2025-06-02 17:43:16 +08:00
zhuyu
14c8801cba feature: task notice 2025-06-02 17:42:39 +08:00
xman
c1ac4bf315 sth 2025-06-02 15:19:53 +08:00
xman
beaa0a32a9 sth 2025-06-02 15:13:51 +08:00
xman
51b3dec40c 完成订单重构 2025-06-02 15:12:41 +08:00
xman
b6cc5c5cc6 完成订单重构 2025-06-02 14:08:34 +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
zhuyu
f25f1bb262 feature: task notice 2025-06-02 12:21:17 +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
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
xman
ad4ea19122 完成订单重构 2025-06-01 22:59:53 +08:00
xman
a03f58bbc9 完成订单重构 2025-06-01 22:57:29 +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
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
684c4d3801 完成订单重构 2025-06-01 22:31:47 +08:00
xman
fa33ccd504 完成订单重构 2025-06-01 22:31:08 +08:00
xman
d5050f0dd0 完成订单重构 2025-06-01 22:28:02 +08:00
xman
d19845a072 完成订单重构 2025-06-01 17:27:19 +08:00
xman
2cad3d65da 完成订单重构 2025-06-01 16:25:17 +08:00
xman
12fd8dd404 完成订单重构 2025-06-01 16:22:35 +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
6d69f99d5a 跟进重构 2025-06-01 14:33:53 +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
f67850dafe 跟进重构 2025-05-31 17:12:08 +08:00
xman
21dbd1d5a5 跟进重构 2025-05-31 17:04:59 +08:00
xman
62dbe6a876 default 2025-05-31 15:33:22 +08:00
xman
e548cf86a4 sort 2025-05-31 15:21:01 +08:00
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
886cd60929 feat: 【小程序接口】完成服务时,新增材料相关参数 2025-05-30 22:44:38 +08:00
a7842e1fc8 订单异常 2025-05-30 17:53:43 +08:00
zhuyu
69860cd845 feature: 按钮名称 2025-05-30 17:42:56 +08:00
zhuyu
61a97c6030 feature: 按钮名称 2025-05-30 17:42:18 +08:00
zhuyu
47f5d72134 feature: 按钮名称 2025-05-30 17:37:19 +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
c3608ed9bd feature: 按钮名称 2025-05-30 15:24:19 +08:00
zhuyu
886801637b feature: 按钮名称 2025-05-30 15:24:05 +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
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
806af24853 feature: 结算按钮 2025-05-30 11:13:03 +08:00
苟川东
cc04d452e7 Merge branch 'develop' of e.coding.net:g-bcrc3009/allocatr/allocatr into feature/dgg 2025-05-30 11:09:51 +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
78b9154624 修改 2025-05-29 23:03:48 +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
94c3b86d1c feature: 工资管理类型 2025-05-29 18:17:28 +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
60960debe7 feature: 工资管理 2025-05-29 14:48:47 +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
苟川东
dbfc1cc145 feat: 【后端API】新增更新进度接口 2025-05-28 15:51:55 +08:00
zhuyu
402146a6d7 Accept Merge Request #77: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/77?initial=true
2025-05-28 11:14:24 +08:00
zhuyu
554b386fac feature: 面板 2025-05-28 11:13:41 +08:00
zhuyu
b9849e981b Accept Merge Request #76: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/76?initial=true
2025-05-28 11:09:00 +08:00
zhuyu
35adcd12d9 feature: 面板 2025-05-28 11:07:42 +08:00
zhuyu
f26559be6c Accept Merge Request #75: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/75?initial=true
2025-05-28 10:59:32 +08:00