1462 Commits (f01bb2dc78258f542b384eec83e97e41e05ed572)

Author SHA1 Message Date
水人 81d84877bc
update src/views/bpm/model/ModelForm.vue.
创建的是用路由地址,但那个表单查看的是VUE源码的组件地址,不是路由。给我造成了很大的困扰~

Signed-off-by: 水人 <417693680@qq.com>
2 years ago
puhui999 7fd564307d fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题 2 years ago
YunaiV 5e265a9094 CRM:【联系人】统一字段 2 years ago
YunaiV d71097ac31 📖 CRM:【客户配置】调整目录结构 2 years ago
YunaiV 4fbb3b88e6 📖 CRM:【客户】微调客户列表界面 2 years ago
YunaiV 7448f6e08c 📖 CRM:【客户】微调客户列表界面 2 years ago
YunaiV 0a4023ef00 📖 CRM:code review 商机模块 2 years ago
芋道源码 45521c139c
!350 crm联系人商机review修改
Merge pull request !350 from zyna/dev
2 years ago
芋道源码 0338caeef6
!355 修复一些 issues 提到的问题
Merge pull request !355 from puhui999/dev-crm
2 years ago
YunaiV 1eefa02c4c 📖 操作日志的界面实现 2 years ago
芋道源码 631c105f94
!346 feat:新增公共操作日志详情组件
Merge pull request !346 from puhui999/dev-crm
2 years ago
puhui999 d766b36e72 fix: 修复请假申请提交后页面不返回的bug 2 years ago
YunaiV 8aa49f2e1d Merge remote-tracking branch 'origin/dev' into dev 2 years ago
YunaiV ccb997ac2a 🐛 修复 Excel 导出失败时,依然下载的问题 2 years ago
puhui999 aadad39a69 fix: 修复文件上传数据回显错误 2 years ago
puhui999 261d8b2aa4 crm-客户:集成操作日志详情组件 2 years ago
AhJindeg 2223f7f197 fix(task): 🐞 Update return list API endpoint
- 修改获取回退节点列表接口地址
2 years ago
落日晚风 21e8dbf985 满减送数据对接 2 years ago
YunaiV 9591ed7084 📖 code review:店铺装修逻辑 2 years ago
YunaiV b86f082306 📖 code review:店铺装修逻辑 2 years ago
zyna 2cfe006def crm联系人商机修改 2 years ago
zyna dd4482fad2 crm联系人商机修改 2 years ago
zyna a1fd3afc32 crm联系人商机修改 2 years ago
owen ca35e1a4af 统计:增加商品统计 2 years ago
YunaiV df1c565cd9 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
YunaiV be4750a174 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
水人 346863a8a9
update src/api/bpm/task/index.ts.
后台接口地址是return-list,前台写成了get-return-list

Signed-off-by: 水人 <417693680@qq.com>
2 years ago
owen 80355f3acd 营销:优化商城装修组件 2 years ago
owen 33162a12c0 营销:适配商城装修组件【标题栏】 2 years ago
owen 41a404a52c 营销:适配商城装修组件【热区】 2 years ago
puhui999 455688eaa8 crm-客户:集成操作日志详情组件 2 years ago
puhui999 59c6670775 feat:新增公共操作日志详情组件 2 years ago
owen edfdee8cc1 营销:适配商城装修组件【悬浮按钮】 2 years ago
owen 76025b6821 营销:适配商城装修组件【弹窗广告】 2 years ago
owen 59ff6b13fb 封装拖拽组件,提供移动、新增、删除功能 2 years ago
owen 9ff4f1f7a9 商城装修:修复同一类型的组件切换时,右侧属性面板不更新的问题 2 years ago
owen a7512ba2c7 修复商城首页,快捷入口的图标宽高不一致的问题 2 years ago
owen cd89f75b07 营销:完善装修编辑器预览功能 2 years ago
owen 784623724d 营销:完善装修编辑器预览功能 2 years ago
owen eec3a21852 营销:完善装修编辑器重置功能 2 years ago
owen 9128fa98f5 修复首页头像不显示 2 years ago
芋道源码 b4aa09aa6c
!327 【新增】ureport2 集成
Merge pull request !327 from souvc/master
2 years ago
芋道源码 1e6ceabd3b
!343 优化:商品库存为0时,商品列表商品封面显示已售罄,商品详情页用户无法下单
Merge pull request !343 from 奕泽云/master
2 years ago
YunaiV ce79dd68a3 📈 CRM:code review 联系人商机功能 2 years ago
芋道源码 d6291382e8
!341 crm联系人商机功能
Merge pull request !341 from zyna/dev
2 years ago
YunaiV f8c4700c2e 🔨 CRM:优化产品分类代码的实现 2 years ago
YunaiV b3d66cd0aa 🔨 CRM:优化产品代码的实现 2 years ago
芋道源码 ee9667504f
!342 【CRM:优化产品以及产品分类】
Merge pull request !342 from ZanGe丶/master
2 years ago
YunaiV 0c613e94a8 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2 years ago
ZENGlei11350 dee8215da2 优化:添加商品时0库存商品无法保存改为可以保存 2 years ago
liuhongfeng d9ed3d1a6b Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2 years ago
ZanGe丶 dde61c29a0 【crm:优化产品及产品分类】 2 years ago
zyna ba49b2851c 联系人商机功能 2 years ago
Marvin aac60380bc feat: 跳转到例外一个标签页预览 2 years ago
Marvin 2a0b329565 feat: 新增文件内容项,图片时展示,pdf时跳转到预览,其他文件下载 2 years ago
Marvin 19e3297667 feat: 文件列表增加图片的展示和预览 2 years ago
puhui999 55c64d9c1b fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误 2 years ago
Evol郑天 3009c04d0a 修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
2 years ago
YunaiV 7748704639 🐛 修复 accessLog、errorLog 在 IDEA 报错的问题 2 years ago
YunaiV 5eb30c7e85 🐛 修复 job 在 IDEA 报错的问题 2 years ago
liuhongfeng 0b9cf35b17 【修改】ureport2 集成 2 years ago
YunaiV 85fe4ad8d6 🐛 修复 file 在 IDEA 报错的问题 2 years ago
YunaiV aecc9bb8cb 🐛 修复 IDEA 在 `v-for="dict in getIntDictOptions(...)"` 时,`el-option` 的 `key` 会告警的问题 2 years ago
YunaiV 3d2d48b601 🐛 修复 user 在 IDEA 报错的问题 2 years ago
YunaiV fa421d0895 🐛 修复 tenant 在 IDEA 报错的问题 2 years ago
YunaiV a6deb69ddc 🐛 修复 social 在 IDEA 报错的问题 2 years ago
YunaiV 3407cc66a9 🐛 修复 sms 在 IDEA 报错的问题 2 years ago
YunaiV dd4a77ff22 🐛 修复 sensitiveWord 在 IDEA 报错的问题 2 years ago
YunaiV 6593c603a2 🐛 修复 menu 在 IDEA 报错的问题 2 years ago
YunaiV 2ceb3b978c 🐛 修复 oauth2 在 IDEA 报错的问题 2 years ago
YunaiV 5766dc81d1 🐛 修复 notify 在 IDEA 报错的问题 2 years ago
YunaiV b103c40874 🐛 修复 notice 在 IDEA 报错的问题 2 years ago
YunaiV 1066551fd1 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2 years ago
YunaiV 757fbddef2 🐛 修复 dictType 和 dictData 在 IDEA 报错的问题 2 years ago
YunaiV a77173f2ae 🐛 修复 post 和 dept 在 IDEA 报错的问题 2 years ago
owen b982397449 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
owen 3c8ffc8c21 营销:适配商城装修组件【用户卡券】 2 years ago
owen c058048fac 营销:适配商城装修组件【用户资产】 2 years ago
owen 2c1edfa781 营销:适配商城装修组件【用户订单】 2 years ago
owen af67db577d 营销:适配商城装修组件【用户卡片】 2 years ago
YunaiV b0c1e55c6a crm: 增加基于客户查询回款计划分页 2 years ago
owen d5f9d31d32 营销:适配商城装修组件【拼团】(待重写) 2 years ago
owen 7e44b621a5 营销:适配商城装修组件【秒杀】(待重写) 2 years ago
YunaiV bdc80ea55b crm: 增加基于客户查询回款分页 2 years ago
owen b4ba1043d6 eslint 2 years ago
owen 08be359578 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
owen 23a6bf5ef5 营销:商城装修增加控件【APP 链接选择】 2 years ago
YunaiV 88e5e67a89 crm: 增加基于客户查询商机分页 2 years ago
YunaiV 31a42fc3f7 crm:增加合同 List 组件 2 years ago
YunaiV 5f26c4afe9 crm:完善数据权限的界面 2 years ago
YunaiV 7de0e93d5a crm:联系人增加 ContactList 组件,提供给其它模块内嵌 2 years ago
YunaiV 2cda0cdd9f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/crm/contact/ContactForm.vue
2 years ago
YunaiV 8b787176b6 crm:code review 客户详情 2 years ago
wanwan 443f65b5dc !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2 years ago
YunaiV ddfceddf4a crm:code review 联系人详情 2 years ago
YunaiV ae8cb9218c crm:code review 客户详情 2 years ago
wanwan 85810c0786 !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2 years ago
YunaiV c5b2fdecd5 crm:code review 商机类型 2 years ago
ljlleo 50430bb9cd 商机、商机状态类型 2 years ago
YunaiV 661dc2ff67 crm:code review 成员 2 years ago
dhb52 e106fb73b6 Merge remote-tracking branch 'yudao/master' into dhb52_master 2 years ago
zyna ed22e02b5b crm联系人review修改 2 years ago
芋道源码 57b20f1810
!336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
2 years ago
YunaiV 1ba450103e crm:code review 联系人详情 2 years ago
YunaiV 24773a6eaa crm:code review 客户详情 2 years ago
wanwan e1f9e16a77 !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2 years ago
YunaiV 3c19cb1a85 crm:code review 商机类型 2 years ago
ljlleo b3515b2db5 商机、商机状态类型 2 years ago
YunaiV 4e1748caa3 crm:code review 成员 2 years ago
Evol郑天 633965b07d
同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
2 years ago
zyna 46a8755c93 联系人review修改 2 years ago
芋道源码 8aa17b673b
!331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
2 years ago
liuhongfeng 7df7719be3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2 years ago
owen d4dc105b4f 营销:适配商城装修组件【营销文章】 2 years ago
芋道源码 54897b6d1b
!332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
2 years ago
芋道源码 c6192a1918
!329 完善团队成员公共组件,crm-客户:集成团队成员
Merge pull request !329 from puhui999/dev-crm
2 years ago
Marvin b95b8008f7 feat: 菜单右上角加一个搜索图标 2 years ago
liuhongfeng 764e1715be Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2 years ago
owen c3cad3f3ee 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题 2 years ago
YunaiV 1744c6ec6f websocket 重新封装 2 years ago
puhui999 f8b56a8c46 crm-客户:公海数据区分 2 years ago
dhb52 c2038b95bf Merge remote-tracking branch 'yudao/master' 2 years ago
liuhongfeng aceac6daae 【修改】ureport2 集成 2 years ago
owen 253401ace3 营销:适配商城装修组件【优惠券】 2 years ago
puhui999 12b59200c1 crm-客户:集成团队成员 2 years ago
puhui999 19a0a83054 crm-数据权限:完善团队成员公共组件 2 years ago
YunaiV f74ddf46ae sms:移除 sendCode、sendMsg 字段 2 years ago
owen 1bb9df7b3c 商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题 2 years ago
liuhongfeng 4440ec866c 【新增】ureport2 集成 2 years ago
owen e0a731dd86 商品评论、优惠券模板复用组件【商品橱窗】 2 years ago
owen 3198688eb5 营销:适配商城装修组件【商品栏】 2 years ago
芋道源码 b0b669129b
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
2 years ago
YunaiV ebb19cfe8c Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
YunaiV b1f5ad55b8 crm:code review 权限列表 2 years ago
芋道源码 2e01944df9
!322 crm-团队成员:完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
2 years ago
芋道源码 5f0b0bd21d
!324 商城装修
Merge pull request !324 from 疯狂的世界/dev
2 years ago
芋道源码 9d7c578d48
!323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
2 years ago
YunaiV 526172af60 crm:code review 客户配置管理 2 years ago
芋道源码 c06223decd
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
2 years ago
芋道源码 f07d37438d
!321 修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Merge pull request !321 from 柯杨/master
2 years ago
YunaiV 85e953b920 crm:code review 联系人管理 2 years ago
YunaiV 7c5ae17d04 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/components/DiyEditor/components/ComponentContainer.vue
2 years ago
芋道源码 538783ce2d
!317 crm联系人前端
Merge pull request !317 from zyna/master
2 years ago
YunaiV f1e3eccc8a Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2 years ago
YunaiV 652698b871 代码生成:增加说明文档 2 years ago
芋道源码 26dba8b457
!325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
2 years ago
YunaiV a42d0695fe 代码生成:增加主子表 erp 模式的示例 2 years ago
口口口 68f6683e52
update src/views/Profile/components/UserSocial.vue.
在这里绑定,绑定成功后,列表重复

Signed-off-by: 口口口 <17975121@qq.com>
2 years ago
owen b4a1772584 营销:适配商城装修组件【商品卡片】 2 years ago
YunaiV 6c405ba420 代码生成:增加主子表 inner 模式的示例 2 years ago
YunaiV 9aca49c1ff 代码生成:增加主子表 normal 模式的示例 2 years ago
YunaiV bbc37613b6 代码生成:增加 tree 树形的示例 2 years ago
YunaiV 3d0c4f4422 代码生成:支持树形表结构的配置 2 years ago
YunaiV 40b1522ed0 代码生成:增加 crud 单表示例 2 years ago
Wanwan 22206b25e1 feat: CRM 客户限制 2 years ago
xingyu 821c804189 fix: stylelint 2 years ago
xingyu 249e0d21a3 fix: eslint 2 years ago
puhui999 8e0cf5c1e5 crm-团队成员:新增获得权限级别名称函数 getLevelName 2 years ago
puhui999 ba702d03bc Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2 years ago
puhui999 015a1640c1 crm-团队成员:完善团队成员通用组件封装 2 years ago
YunaiV 45656562a8 代码生成:支持设置主子表的信息 2 years ago
柯杨 8bb9dec328
【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
2 years ago
puhui999 27c9a0f32d crm-团队成员: 先提交一波 2 years ago
puhui999 2385cd9b9a fix:如果已经到重新登录页面则不进行弹窗提示 2 years ago
YunaiV 999d8de9e9 代码生成:增加主子表(内嵌)的示例 2 years ago
YunaiV f0f7886025 代码生成:增加主子表(普通)的示例 2 years ago
YunaiV 72c5eaae31 代码生成:增加 one 情况下的示例代码 2 years ago
owen 49ebadd748 营销:适配商城装修组件【广告魔方】 2 years ago
Wanwan 702f23e672 feat: CRM 客户限制 2 years ago
zyna ed26142bb0 crm联系人init 2 years ago
Wanwan a7f86dfd8b feat: CRM 客户限制 2 years ago
Wanwan 6369b334e3 feat: CRM 客户限制 2 years ago
YunaiV 55f6e4ca25 主子表:确认列表编辑的支持组件情况 2 years ago
Wanwan b63e2a9efb Merge remote-tracking branch 'origin/dev' into dev 2 years ago
YunaiV 9f9e0f8bda 主子表:同步三种模式的代码 2 years ago
niou233 af5d1cf25e
update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2 years ago
niou233 1ab5b44254
update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2 years ago
niou233 2ff97758fd
update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2 years ago
YunaiV 86d9a97ccb 主子表:暂时存储,参数校验-表单数据跑通 2 years ago
YunaiV d45ebd4fcf 主子表:暂时存储,样式跑通 2 years ago
YunaiV 4e413a10e6 主子表:暂时存储,准备重构 2 years ago
YunaiV e9299c6710 多租户:登录界面,根据 host 域名获取对应的租户编号 2 years ago
YunaiV a08e9bea7c 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2 years ago
owen 82aed175ab 营销:适配商城装修组件【菜单导航】 2 years ago
Wanwan 59b2d89a18 feat: CRM 客户公海配置 2 years ago
Wanwan 288aa72cdd feat: CRM 客户公海配置 2 years ago
owen ac42493659 营销:适配商城装修组件【宫格导航】 2 years ago
owen 325e2e4ff2 营销:适配商城装修组件【列表导航】 2 years ago
niou233 084009f7f2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2 years ago
niou233 f2c71d5836 refactor: 会员商品收藏 2 years ago
Wanwan 57474c0644 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
Wanwan 7146fdc9b9 style: 客户 review 修改 2 years ago
YunaiV eb9f8c9f6f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2 years ago
YunaiV 85ee558bef 多租户:登录界面,根据 host 域名获取对应的租户编号 2 years ago
YunaiV c0d5c76a06 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2 years ago
owen 4253173a2a 营销:适配商城装修组件【轮播图】 2 years ago
owen 6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
dhb52 89dbb8c9e8 perf: 优化.env配置 2 years ago
owen bb2b7ffd03 营销:增加商城装修组件【视频播放】 2 years ago
VicoHu 3f803767c4
fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
2 years ago