Commit Graph

930 Commits (6abefe9c1e9707d7994913e85e12e704f2c49e19)

Author SHA1 Message Date
jason a2832f1546 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-30 21:08:28 +08:00
jason 688f7c9083 feat: [BPM 工作流] Simple 模型 - 触发器节点条件设置 2025-05-30 21:06:41 +08:00
xingyu4j 1074b90c6f feat: mp account 2025-05-30 20:51:13 +08:00
xingyu4j c7f207034f feat: mp api 2025-05-30 20:51:03 +08:00
xingyu4j 4f4d4972c5 fix: crm business 2025-05-30 16:24:31 +08:00
jason 9587a8cdcd feat: [BPM 工作流] Simple 模型 - 触发器节点 2025-05-30 12:42:41 +08:00
xingyu4j 7f6726f456 feat: add customer-limit-config 2025-05-30 00:40:14 +08:00
xingyu4j daee025866 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-29 23:55:08 +08:00
xingyu4j a5807d2bd8 feat: crm product category 2025-05-29 23:55:00 +08:00
xingyu d1c45ef41b
!121 Merge remote-tracking branch 'yudao/dev' into dev
Merge pull request !121 from Jason/dev
2025-05-29 15:29:54 +00:00
xingyu4j a043e4a746 feat: crm backlog 2025-05-29 23:27:57 +08:00
jason 55fda075e2 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-29 21:14:26 +08:00
xingyu4j 4969799412 feat: config 2025-05-29 21:11:12 +08:00
xingyu4j 62bb005748 feat: config 2025-05-29 21:09:54 +08:00
xingyu4j 32bd64a008 feat: customer pool config 2025-05-29 20:58:47 +08:00
xingyu4j b4855beb1f feat: crm customer pool 2025-05-29 20:03:12 +08:00
xingyu4j 5424775317 feat: crm receivable 2025-05-29 19:58:40 +08:00
xingyu4j d71d312237 feat: crm receivable 2025-05-29 17:47:59 +08:00
xingyu4j 45bcc79241 perf: crm 2025-05-29 17:33:05 +08:00
xingyu4j b4a77266a1 perf: 优化显示效果 及 formatter row cellvalue的区分 2025-05-29 14:52:03 +08:00
xingyu4j 8be5c19154 feat: crm 2025-05-29 14:51:33 +08:00
xingyu4j c18b6a9b75 feat: crm 2025-05-29 14:51:23 +08:00
xingyu4j 2aaf8aad8b perf: 合并 select-modal 方便后续增加更多类似组件 2025-05-29 11:32:56 +08:00
jason f679df0036 feat: [BPM 工作流] Simple 模型 - 抄送人节点 2025-05-29 10:21:33 +08:00
jason f7edc78a59 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-29 08:53:44 +08:00
jason 54d1471d43 fix: [BPM 工作流]修复审批人节点校验的问题 2025-05-29 08:51:48 +08:00
xingyu4j 5f6581b1c6 perf: code style 2025-05-29 01:51:38 +08:00
xingyu4j f6a5ca97a4 feat: add crm product 2025-05-29 01:51:29 +08:00
xingyu4j 22397032ec perf: list style 2025-05-29 01:43:53 +08:00
xingyu4j 7d24a69a28 feat: 用户详情完成【等待商城模块完成同步其余项】 2025-05-29 01:11:58 +08:00
xingyu4j 616069cc0c feat: member detail add UserAddressList 2025-05-29 01:09:17 +08:00
xingyu4j 42c001c1c3 feat: member detail add UserBalanceList 2025-05-29 01:00:25 +08:00
xingyu4j 4da3510db8 feat: add member detail UserExperienceRecordList 2025-05-29 00:54:44 +08:00
xingyu4j e1234978bf perf: signin 2025-05-29 00:54:21 +08:00
xingyu4j 9cd67c1590 perf: point 2025-05-29 00:54:12 +08:00
xingyu4j 8ad0bbc427 feat: member detail 2025-05-29 00:40:19 +08:00
xingyu4j 2583d14455 feat: member detail 2025-05-29 00:40:08 +08:00
xingyu4j 46176931c4 perf: form style 2025-05-29 00:39:53 +08:00
xingyu4j 70247fd5f1 fix: actions 2025-05-28 22:58:37 +08:00
xingyu4j 09f26320f7 feat: member user 2025-05-28 22:57:58 +08:00
xingyu4j 868c0f822f feat: member user 2025-05-28 22:26:42 +08:00
xingyu4j 564fd5b64c fix: getAreaTree 2025-05-28 22:19:12 +08:00
xingyu4j 693595b334 feat: add member detail 2025-05-28 21:59:47 +08:00
xingyu4j dbf948020e feat: 签到配置 2025-05-28 21:22:34 +08:00
xingyu4j d7b1939ab7 fix: 日期查询 2025-05-28 21:06:58 +08:00
xingyu4j 2e3c43091a feat: 签到记录 2025-05-28 21:06:48 +08:00
xingyu4j d1ae887eba feat: 会员积分 2025-05-28 20:59:02 +08:00
xingyu4j 0b3b5799ea feat: 会员分组 2025-05-28 20:50:11 +08:00
xingyu4j 5718bf6de6 feat: 会员列表 2025-05-28 20:43:35 +08:00
xingyu4j 10b2ec7316 feat: 会员标签 2025-05-28 20:11:03 +08:00
xingyu4j 643b44862a fix: 文本错误 2025-05-28 20:05:46 +08:00
xingyu4j 089d3bbd9b feat: add member config 2025-05-28 19:00:21 +08:00
xingyu4j da45d15f0d perf: utils 2025-05-28 18:26:38 +08:00
jason db63d80338 feat: [工作流] Simple 模型 - 审批人节点监听器配置 2025-05-28 14:14:23 +08:00
xingyu4j 6236f59473 perf: 优化部分显示效果 2025-05-28 11:36:52 +08:00
xingyu 77ccb9a5d8
!117 Merge remote-tracking branch 'yudao/dev' into dev
Merge pull request !117 from Jason/dev
2025-05-27 14:16:47 +00:00
xingyu4j cd239afd83 feat: pay cashier 2025-05-27 22:15:34 +08:00
xingyu4j 58bef6359f fix: pay app 2025-05-27 22:15:24 +08:00
xingyu4j 6eeb57eadb fix: required 2025-05-27 22:14:49 +08:00
xingyu4j 4736a5b3fe fix: error 2025-05-27 19:53:44 +08:00
jason 8e111921dd Merge remote-tracking branch 'yudao/dev' into dev 2025-05-27 18:43:18 +08:00
jason d49def855f feat: Simple 模型 - 审批人节点 80% 2025-05-27 18:40:52 +08:00
xingyu4j 09942f0257 feat: add cashier views 2025-05-27 18:40:02 +08:00
xingyu4j 612d4930e2 feat: add pay wallet 2025-05-27 15:31:19 +08:00
xingyu4j 64cd606c87 feat: add formatNumber 2025-05-27 15:31:06 +08:00
xingyu4j d46c17293c feat: pay tansfer 2025-05-27 14:38:38 +08:00
xingyu4j 3b25efcc7e feat: pay demo 2025-05-27 14:20:07 +08:00
xingyu4j b67e4faab4 feat: add pay cashier route 2025-05-27 11:50:16 +08:00
xingyu4j d6e1273199 fix: warn 2025-05-27 11:43:56 +08:00
xingyu4j cdd136d4fd feat: 移除slots 2025-05-27 10:39:06 +08:00
xingyu4j 806051e038 perf: 去掉边框颜色 2025-05-26 19:06:13 +08:00
xingyu4j 6098e84119 feat: add height 2025-05-26 19:05:45 +08:00
xingyu4j f15f7d4fc2 perf: code style 2025-05-26 19:05:31 +08:00
xingyu4j 68a160cfb2 fix: 注释 2025-05-26 18:51:52 +08:00
xingyu4j 7b886b315b feat: 去除 slotName 使用input upload 2025-05-26 18:48:27 +08:00
xingyu4j ba18eb37da feat: add input upload 2025-05-26 18:46:06 +08:00
xingyu 3c4f954b77
!115 Merge remote-tracking branch 'yudao/dev' into dev
Merge pull request !115 from Jason/dev
2025-05-26 09:30:11 +00:00
xingyu4j 281a2ebae0 fix: formatAmount 重复定义 2025-05-26 17:29:34 +08:00
xingyu4j ae7b549879 refactor: pay 2025-05-26 17:22:09 +08:00
jason ce02f7d520 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-26 16:58:43 +08:00
xingyu4j a602decde9 refactor: pay app 2025-05-26 16:52:11 +08:00
jason ef93c9824a Merge remote-tracking branch 'yudao/dev' into dev 2025-05-26 16:44:20 +08:00
xingyu4j 67af898baf Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-26 14:49:12 +08:00
xingyu4j 44cc41ec92 feat: 使用 v-dompurify-html 替换 v-html 2025-05-26 14:21:05 +08:00
jason 11f32258e6 feat: Simple 流程模型- 发起人节点配置 2025-05-26 14:20:32 +08:00
xingyu4j be1889a0e0 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-05-26 10:50:54 +08:00
xingyu f64425b724
!88 feat: 添加渠道配置和应用管理功能,更新相关表单和数据结构
Merge pull request !88 from 痴货/pay-master
2025-05-26 02:24:11 +00:00
xingyu 3355024e42
!114 Merge remote-tracking branch 'yudao/dev' into dev
Merge pull request !114 from Jason/dev
2025-05-26 02:23:22 +00:00
jason deefea6a18 perf: review todo 的修改 2025-05-25 08:46:09 +08:00
jason 8e88db8d11 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-24 23:31:18 +08:00
jason 6649301dba feat: simple 模型设计样式规范修改 2025-05-24 23:29:28 +08:00
jason 0f576e006b feat: 流程设计- Simple 模型设计 20% 2025-05-24 23:02:24 +08:00
子夜 e3948bbc50 fix: 【BPM 工作流】修复流程表单操作列宽,消除控制台警告 2025-05-24 16:53:59 +08:00
子夜 7762059537 fix: 优化待办任务摘要字段的渲染方式 2025-05-24 16:43:44 +08:00
子夜 e1434c7b2d feat: 【BPM 工作流】新增OA请假示例详情页面,完善请假信息展示和数据获取逻辑 2025-05-24 16:29:38 +08:00
子夜 370c257cf5 fix: 【BPM 工作流】选择发起人时 activityId 类型转换导致无法正确选择发起人的问题。 2025-05-24 16:07:18 +08:00
子夜 01f929e10f feat: 【BPM 工作流】完善操作按钮、流程签名组件 2025-05-24 15:10:03 +08:00
子夜 66ac3de5c1 feat:【BPM 工作流】 完善流转记录列表 2025-05-24 10:51:57 +08:00
子夜 e39e5a4ed8 feat: 增加用户选择模态框中的部门树节点深度限制,部门按名称检索 2025-05-24 09:50:36 +08:00
子夜 c0a82df7f4 Merge remote-tracking branch 'origin/dev' into dev-bpm 2025-05-24 09:35:54 +08:00