Commit Graph

374 Commits

Author SHA1 Message Date
zhuyu
b456b03c06 feature: salary menu 2025-06-03 23:21:49 +08:00
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
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
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
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
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
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
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
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
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
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
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
zhuyu
831a47b19b Accept Merge Request #78: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/78?initial=true
2025-05-28 11:20:27 +08:00
zhuyu
5208dd3dcd feature: 面板 2025-05-28 11:20:03 +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
zhuyu
faa9d20ab8 feature: 面板 2025-05-28 10:58:35 +08:00
zhuyu
74ad433809 feature: 面板 2025-05-28 10:52:13 +08:00
cc6e507f0e Accept Merge Request #73: (feature/hant -> develop)
Merge Request: 退款数据

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/73?initial=true
2025-05-27 23:55:22 +08:00
353fd4c3eb 退款数据 2025-05-27 23:54:30 +08:00
zhuyu
1354a77bc2 Accept Merge Request #70: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/70?initial=true
2025-05-27 13:48:40 +08:00
zhuyu
3b3c95b5e0 feature: 面板 2025-05-27 13:48:10 +08:00
zhuyu
855ea79efd Accept Merge Request #69: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/69
2025-05-27 11:11:43 +08:00
zhuyu
910edcb047 feature: 面板 2025-05-27 09:30:20 +08:00
5d1a7d95f4 Accept Merge Request #68: (feature/hant -> develop)
Merge Request: 退款数据

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/68?initial=true
2025-05-27 00:04:26 +08:00
1ab27a7bb8 退款数据 2025-05-27 00:03:42 +08:00
zhuyu
a304012276 Accept Merge Request #67: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/67
2025-05-26 18:16:55 +08:00
zhuyu
27310f5a3c feature: 面板 2025-05-26 18:16:06 +08:00
zhuyu
1a0061cb71 Accept Merge Request #66: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/66?initial=true
2025-05-26 18:12:14 +08:00
zhuyu
5979ce5abf feature: 面板 2025-05-26 17:26:42 +08:00
zhuyu
72c48d1a51 Accept Merge Request #64: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/64?initial=true
2025-05-26 11:40:13 +08:00
zhuyu
d62501995d feature: 面板 2025-05-26 11:39:48 +08:00
zhuyu
fdf5858308 Accept Merge Request #63: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/63?initial=true
2025-05-26 11:01:00 +08:00
zhuyu
a9c1c75826 feature: 面板 2025-05-26 11:00:33 +08:00
884a41ccc8 Accept Merge Request #62: (feature/hant -> develop)
Merge Request: 退款数据

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/62?initial=true
2025-05-25 23:02:58 +08:00
feeae1c5b1 退款数据 2025-05-25 23:02:23 +08:00
5993c3e2e1 Accept Merge Request #61: (feature/hant -> develop)
Merge Request: 派单地图

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/61?initial=true
2025-05-24 19:07:54 +08:00
c6979b7129 派单地图 2025-05-24 19:07:07 +08:00
zhuyu
35ac2312c8 Accept Merge Request #60: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/60?initial=true
2025-05-23 17:55:47 +08:00
zhuyu
fef82b5a66 feature: 面板 2025-05-23 17:48:10 +08:00
zhuyu
8e87f97bea Accept Merge Request #58: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/58?initial=true
2025-05-23 15:34:22 +08:00
zhuyu
01ff921514 feature: 面板 2025-05-23 15:09:32 +08:00
zhuyu
ba346a4520 feature: 面板 2025-05-23 15:02:36 +08:00
zhuyu
adf7bd959e feature: 面板 2025-05-23 14:16:04 +08:00
zhuyu
531edc68c3 Accept Merge Request #57: (feature/zy -> develop)
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/57
2025-05-22 18:01:21 +08:00
zhuyu
73700581bf feature: 面板 2025-05-22 17:55:28 +08:00