Commit Graph

446 Commits (3fc90c00b7e75721ba3f83ca8c464085116fec8c)

Author SHA1 Message Date
zy a22b8dccef 合计 2025-05-10 18:15:12 +08:00
zy bb812d011f 项目-商机 2025-05-10 17:55:35 +08:00
zy c76055af50 合并冲突 2025-05-09 21:22:40 +08:00
zy 747be37cea 打印 2025-05-09 21:11:10 +08:00
quu 79345cf163 hrm 2025-05-09 22:10:39 +09:00
苑坤 c233f46dec 这里的产品名称、产品编号、产品类型、明细类型、单位需要修改为自动获取,单位名称弹窗选择 2025-05-09 16:09:52 +08:00
苑坤 6dd7443c11 这里的产品名称、产品编号、产品类型、明细类型、单位需要修改为自动获取,单位名称弹窗选择 2025-05-09 16:09:16 +08:00
苑坤 323938977c 这里的产品名称、产品编号、产品类型、明细类型、单位需要修改为自动获取,单位名称弹窗选择 2025-05-09 16:07:52 +08:00
苑坤 6e82fc67bb 1、新增资金成本设置开发完成 2025-05-09 15:48:33 +08:00
苑坤 b89f45e159 1、新增资金成本设置,需要优化页面
2、产品采购成本设置功能,需要修改页面内容,优化展示页面
2025-05-09 13:33:18 +08:00
zy 9e53e72f1e 合同 2025-05-07 21:47:59 +08:00
zy efd3c8d3f1 样式调整 2025-05-06 17:16:24 +08:00
zy 3df2e03cba 详情 2025-05-06 08:55:44 +08:00
zy 9a28e2416f 名称 2025-05-05 22:48:21 +08:00
苑坤 7de4fb444c 修噶报价人名称 2025-05-05 22:42:51 +08:00
quu 2d62a68a10 合同打印增加 2025-05-05 22:20:12 +09:00
quu cd17dd9d5f 合同打印增加 2025-05-04 15:34:00 +09:00
quu 08179a9f7f 合同打印增加 2025-05-04 14:46:05 +09:00
quu 98e410e169 crm 报价 商机 合同 三块整改 2025-05-04 14:39:29 +09:00
zy 4f8d9648a9 字段问题 2025-05-04 10:48:30 +08:00
felix eef3422c43 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-03 10:19:50 +08:00
felix 822633023c 合同模版预览 2025-05-03 10:18:10 +08:00
felix f80d3b4e87 合同模版 2025-05-03 10:17:03 +08:00
zy 21f992ed4d 合同新增 2025-05-02 23:13:07 +08:00
zy 3705645cd5 新增合同 2025-05-02 21:50:02 +08:00
zy 35a1f094a1 方案报价 2025-05-02 20:46:37 +08:00
zy 4293fcad54 获取id 2025-05-02 18:28:28 +08:00
quu fc508deac0 crm 报价 商机 合同 三块整改 2025-05-02 17:35:00 +09:00
苑坤 9dfa2c178a 增加第几次报价 2025-05-02 12:21:45 +08:00
苑坤 a09b43ca26 优化 2025-05-02 11:53:38 +08:00
苑坤 2ede3c0853 客户名称只读 2025-05-02 11:52:53 +08:00
quu f89517298a crm 报价 商机 合同 三块整改 2025-05-02 00:10:48 +09:00
quu aed2bc38ec crm 报价 商机 合同 三块整改 2025-05-01 22:37:04 +09:00
quu ae5519d9c4 crm 报价 商机 合同 三块整改 2025-05-01 22:22:46 +09:00
zy 57a3ac118f Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-01 20:18:54 +08:00
zy 79126ca91a 合同变更 2025-05-01 20:18:50 +08:00
苑坤 6d28eb51f6 优化页面 2025-05-01 19:11:35 +08:00
苑坤 af6b4e035d 优化页面 2025-05-01 18:55:06 +08:00
苑坤 e7f020d3df Merge remote-tracking branch 'origin/master' 2025-05-01 18:30:42 +08:00
苑坤 83536596d1 调整页面样式 2025-05-01 18:29:56 +08:00
zy 3b22398ae7 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-01 18:21:44 +08:00
zy 5ab25d6e86 申请 2025-05-01 18:21:41 +08:00
quu 7898d17c4d crm 报价 商机 合同 三块整改 2025-05-01 19:03:18 +09:00
zy f5f0249b42 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-01 17:34:42 +08:00
zy 248ea11952 合同新增 2025-05-01 17:33:14 +08:00
quu 7eea86323c Merge branch 'wkz' 2025-05-01 17:41:38 +09:00
quu 7d7333532c crm 报价 商机 合同 三块整改 2025-05-01 17:41:17 +09:00
苑坤 d506fa487b Merge remote-tracking branch 'origin/master' 2025-05-01 15:26:50 +08:00
苑坤 f66a939237 客户名称可模糊查询 2025-05-01 15:26:34 +08:00
zy 39fea5ff3a 报价 2025-05-01 15:21:49 +08:00
zy 4c9e2eb21d 验证 2025-05-01 13:57:56 +08:00
zy 2a156f4616 页面调整 2025-05-01 12:31:20 +08:00
zy 28154362b2 替换 2025-05-01 11:22:08 +08:00
zy c6cea2752c 1 2025-05-01 00:52:36 +08:00
zy af6d863dc0 报价 2025-05-01 00:50:37 +08:00
zy f22127a4ad 合同变更 2025-04-30 23:49:27 +08:00
zy 912dd110fb 问题修改 2025-04-30 17:59:45 +08:00
苑坤 35ee692d4f 调整页面内容 2025-04-30 11:54:49 +08:00
zy 86e426595b 修改问题 2025-04-29 23:10:39 +08:00
zy 54d277984e 详情 2025-04-29 14:59:15 +08:00
zy a392f7d034 回访类型 2025-04-29 14:04:34 +08:00
zy 8d85aa49b7 合同 2025-04-29 11:32:20 +08:00
zy 5c0e4096f8 工作流 2025-04-29 00:15:39 +08:00
zy cd23457490 合同新增 2025-04-28 22:18:42 +08:00
zy 25cc74d9c3 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa
# Conflicts:
#	src/api/crm/billtemplate/index.ts
#	src/views/crm/quotation/QuotationForm.vue
#	src/views/crm/quotation/components/QuotationProductForm.vue
2025-04-28 20:44:26 +08:00
zy b4dbadc0a6 方案报价 2025-04-28 20:36:48 +08:00
quu 0a3d1daaee Merge branch 'master' into wkz 2025-04-28 18:40:54 +09:00
quu 804ab71841 crm 报价 商机 合同 三块整改 2025-04-28 18:40:37 +09:00
zy 33c57d2328 模版 2025-04-28 17:17:43 +08:00
zy 9bd370647f Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-04-28 14:53:32 +08:00
zy 4ebd624e71 商机 2025-04-28 14:53:29 +08:00
felix 9546839b34 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa
# Conflicts:
#	.env.local
2025-04-28 12:22:24 +08:00
zy 31e9c45532 商机 2025-04-28 11:32:29 +08:00
felix 704eb548de 客户投诉 2025-04-28 11:18:28 +08:00
zy 224e82c0f8 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-04-27 17:20:11 +08:00
zy da4d175e91 修改问题 2025-04-27 17:18:40 +08:00
liuhongyu d0a8f2f974 Merge branch 'wkz' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa
# Conflicts:
#	src/utils/dict.ts
2025-04-27 17:16:18 +08:00
felix 938e430186 客户建议:客户、反馈人下拉框可输入筛选 2025-04-27 12:04:38 +08:00
quu 10d3e06927 crm 报价 商机 合同 三块整改 2025-04-27 12:12:50 +09:00
felix f3ea6f2996 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-04-26 22:40:44 +08:00
felix 886bb98733 客户建议 2025-04-26 22:37:27 +08:00
zhaoyan 739256cd3b 客户 2025-04-26 20:25:01 +08:00
quu eb3eaeff01 crm 报价 商机 合同 三块整改 2025-04-26 16:15:35 +09:00
Eavin 39869cd22e 模板相关 2025-04-26 10:59:36 +08:00
Eavin ed415ae4c5 模板相关 2025-04-26 10:39:24 +08:00
quu 2ff8f2a6ec crm 报价 商机 合同 三块整改 2025-04-25 20:57:08 +09:00
felix d49d64789a 产品管理 2025-04-25 12:42:00 +08:00
quu 112b15ed81 crm 报价 商机 合同 三块整改 2025-04-25 10:47:50 +09:00
杨宇庆 4c5c6ff5c3
fix: 解决商机、合同金额无法自动计算的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-12-11 05:25:43 +00:00
shixiaohe 154dd6c40b 修复雪花算法ID精度丢失 2024-11-24 15:53:31 +08:00
YunaiV 0db57da901 【功能修复】CRM:合同的成员不支持修改的问题 2024-09-17 18:51:11 +08:00
preschooler 8c0380506c 🐞 fix:修复el-input、el-select、el-date-picker宽度 2024-08-31 17:39:48 +08:00
芋道源码 800ebf174f
!511 【优化】el-radio的label属性修改为value以兼容下个版本
Merge pull request !511 from 半栈幼儿员/hotfix/el-radio
2024-08-23 01:00:10 +00:00
preschooler 70efcadc72 🎈 perf:el-checkbox的label属性修改为value以兼容下个版本 2024-08-22 15:49:28 +08:00
preschooler de7a9a484c 🎈 perf:el-radio的label属性修改为value以兼容下个版本 2024-08-22 01:18:36 +08:00
芋道源码 1d07068806
回退 'Pull Request !505 : 【修复】el-input、el-select、el-date-picker宽度;el-radio的label属性兼容下个版本;优化iframe布局' 2024-08-21 13:41:32 +00:00
preschooler 65f1863327 🐞 fix:修复表单中el-date-picker宽度 2024-08-20 22:40:22 +08:00
preschooler dea9ef8cd1 🎈 perf:el-radio的label属性修改为value以兼容下个版本 2024-08-20 22:40:13 +08:00
YunaiV 4acd379d50 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-07-07 17:10:18 +08:00
downeyin f70c8dcee2 fix: 修复CRM合同详情中团队成员未展示权限编辑的问题 2024-07-06 23:31:59 +08:00
YunaiV 73e8516024 【代码评审】CRM:优化员工业绩统计的实现 2024-05-11 22:30:44 +08:00
YunaiV 8ba6095b1b Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
2024-05-11 22:22:27 +08:00
scholar f01dc0a539 优化代码实现。 2024-05-11 11:26:47 +08:00
dhb52 0fb70607d9 fix: id=0导致sqlserver的insert失败 2024-05-06 23:28:33 +08:00
scholar 449d1191ff fix同比环比数据计算的bug。 2024-05-04 22:28:37 +08:00
puhui999 0076236280 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-25 22:34:14 +08:00
YunaiV f55c9b7273 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-24 23:01:05 +08:00
puhui999 6ff31b90c7 CRM: 修复客户导入 2024-04-24 22:55:14 +08:00
YunaiV 1d533e49e4 crm:bugfix FunnelBusiness.vue 导致打包失败的问题 2024-04-24 00:31:44 +08:00
YunaiV dee479ce3c Merge remote-tracking branch 'origin/dev' into dev 2024-04-23 23:31:58 +08:00
YunaiV 715f37eb0b crm:code review 员工业绩统计 2024-04-23 23:31:52 +08:00
YunaiV 56543b8db4 Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
2024-04-23 23:17:15 +08:00
puhui999 deb4585d4b fix: 适配 echarts map 的地名 2024-04-22 11:04:53 +08:00
scholar f4dd1bed63 1, 修改数据列表无法刷新的问题;
2, 修改时间选择,后端按照年实现的,前端同样按照年份选择实现;
3,修改环比同比计算;
4,回款金额统计bug修复。
2024-04-19 17:46:09 +08:00
YunaiV f5d013187b crm:code review 销售漏斗 2024-04-18 09:28:07 +08:00
puhui999 4e640bae88 CRM: 新增商机赢单转化率分析 2024-04-15 16:38:24 +08:00
puhui999 014d1f8cd2 CRM: 新增商机赢单转化率分析 2024-04-15 16:32:48 +08:00
puhui999 6acfc77d08 CRM: 完善销售漏斗 2024-04-15 15:37:37 +08:00
YunaiV c331a83b74 crm:code review 销售漏斗 2024-04-14 21:21:52 +08:00
芋道源码 56829ff921
!426 CRM: 完善销售漏斗分析
Merge pull request !426 from puhui999/dev-crm
2024-04-14 12:19:51 +00:00
puhui999 bc95dc2959 CRM: 完善新增商机分析 2024-04-14 16:31:43 +08:00
puhui999 3c49ed570a CRM: 完善销售漏斗分析 2024-04-14 00:34:33 +08:00
puhui999 2d7bab8adb CRM: 完善用户画像数据统计 2024-04-13 11:04:56 +08:00
puhui999 64af029c86 CRM: 完善用户画像数据统计 2024-04-11 15:25:48 +08:00
dhb52 5358863fc6 refactor: 统一处理null数据为'未知' 2024-04-09 18:47:31 +08:00
dhb52 0e15d6c9d2 feat: 客户成交周期分析(按区域、按产品) 2024-04-09 00:21:10 +08:00
YunaiV e8a3745b5e crm:code review 公海客户分析 2024-04-07 21:27:29 +08:00
芋道源码 091ce90359
!417 feat: 增加[客户公海分析]tab
Merge pull request !417 from dhb52/dev
2024-04-07 13:17:35 +00:00
YunaiV 8f8edc9565 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-06 19:39:14 +08:00
dhb52 3c54f5f565 feat: 增加[客户公海分析]tab 2024-04-06 15:38:50 +08:00
dhb52 13cf1feefb refactor: 使用try finally停止loading 2024-04-06 15:38:04 +08:00
YunaiV 6772568a58 crm:code review 客户画像 2024-04-05 14:43:55 +08:00
芋道源码 8926dd1173
!415 CRM: 完善用户画像数据统计
Merge pull request !415 from puhui999/dev-crm
2024-04-05 05:54:06 +00:00
YunaiV dcfad7a427 crm:code review 员工业绩的前端 2024-04-05 13:53:14 +08:00
芋道源码 f17dfb9a31
!416 CRM员工业绩统计分析v2.0
Merge pull request !416 from scholarli/dev
2024-04-05 05:45:09 +00:00
YunaiV c01571d11d 【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:21:27 +08:00
scholar b57a2c50a9 CRM员工业绩统计分析v2.0 2024-04-03 18:43:34 +08:00
puhui999 36385a74ba CRM: 完善用户画像数据统计 2024-04-03 12:19:09 +08:00
YunaiV 87d1047fa9 CRM:code review【客户画像】的实现 2024-03-30 14:17:14 +08:00
YunaiV 34b788cb88 Merge branch 'dev-crm' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/bpm/definition/index.vue
#	src/views/bpm/model/index.vue
#	src/views/bpm/processInstance/create/index.vue
#	src/views/crm/statistics/customer/index.vue
2024-03-30 12:54:51 +08:00
YunaiV 291dc51849 CRM:完善【排行版】功能 2024-03-30 11:48:41 +08:00
YunaiV 1b7d604858 CRM:code review【客户统计】的代码实现 2024-03-30 11:02:29 +08:00
YunaiV b51397fe19 CRM:优化【客户统计】的代码实现 2024-03-30 09:23:02 +08:00
puhui999 cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2024-03-24 22:22:09 +08:00
dhb52 b0d4c87d8e feat: [CRM-客户分析]增加[时间间隔]选项 2024-03-10 10:30:32 +08:00
puhui999 d21c060903 CRM:完善转移 2024-03-09 17:57:24 +08:00
YunaiV c89941d435 CRM:code review 客户总量统计 2024-03-09 16:51:42 +08:00
芋道源码 55856be1de
!394 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !394 from dhb52/dev
2024-03-09 08:37:59 +00:00
dhb52 762b51a5b4 fix: [CRM-客户统计]根据Code-Review 修改 2024-03-04 23:51:42 +08:00
puhui999 13e925e29f CRM:完善数据权限,实现数据权限同时添加、同时转移 2024-03-03 20:11:52 +08:00