yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,375 Commits
9 Branches
21 Tags
30 MiB
Commit Graph

1230 Commits (aaae71376fbcb14c8cf31b2d5b85384bc1773db8)

Author SHA1 Message Date
YunaiV b0a6af4b40 CRM：合同的 code review 
(cherry picked from commit 3ad68c3227)
 2024-03-11 12:50:09 +08:00
puhui999 d4eb24798b CRM：transfer 
(cherry picked from commit fe91c5ec5c)
 2024-03-11 12:50:02 +08:00
puhui999 1cbc8a29da CRM-合同：完善 TODO 
(cherry picked from commit 6d0e242387)
 2024-03-11 12:49:57 +08:00
YunaiV ad987e9ef1 CRM：优化合同金额排行、回款金额排行 
(cherry picked from commit 4549f8ed3c)
 2024-03-11 12:49:33 +08:00
YunaiV ff84ef64a5 CRM：合同的 code review 
(cherry picked from commit 956f19d9d0)
 2024-03-11 12:49:03 +08:00
安浩浩 82fbaa16a3 修改：商业智能-排行榜，合同金额排行和回款金额排行时间条件和接口修改 
(cherry picked from commit 34a796de89)
 2024-03-11 12:48:04 +08:00
NiceShow 882bcc1db5 fix: label错误-砍价商品 
(cherry picked from commit df7806d8d3)
 2024-03-11 12:47:08 +08:00
anhaohao 450c4ae6d4 新增：商业智能-排行榜，合同金额排行和回款金额排行 
(cherry picked from commit 770e551900)
 2024-03-11 12:46:58 +08:00
puhui999 4714a1b086 CRM-合同：新增合同预览审批流程和提交审核 
(cherry picked from commit 41195d5b4a)
 2024-03-11 12:46:52 +08:00
puhui999 8d1c746113 CRM-合同：新增合同详情 
(cherry picked from commit 668da2fa86)
 2024-03-11 12:45:53 +08:00
puhui999 49b7bb1821 CRM-合同：完善合同表单 
(cherry picked from commit 90e0baf5bc)
 2024-03-11 12:45:47 +08:00
dhb52 b6fbecd32b feat: CRM-backlog-待进入公海的客户 
(cherry picked from commit 4a2349ecf5)
 2024-03-11 12:45:41 +08:00
puhui999 e04bb9e03e CRM-合同：完善合同表单 
(cherry picked from commit 331b6c5611)
 2024-03-11 12:45:23 +08:00
puhui999 0ada34de16 CRM-合同：完善合同表单 
(cherry picked from commit ed94205fa7)
 2024-03-11 12:45:19 +08:00
puhui999 227f69c95d CRM-联系人：完善联系人转移、数据权限 
(cherry picked from commit a64d4240a3)
 2024-03-11 12:45:14 +08:00
puhui999 d3f8d40e40 CRM：统一日志获取接口 
(cherry picked from commit 5adf75d15b)
 2024-03-11 12:45:01 +08:00
puhui999 9f599fb790 CRM-客户：完善客户导入 
(cherry picked from commit 26daa3a1ff)
 2024-03-11 12:44:37 +08:00
dhb52 1cc6adc49b fix: warning UnoCSS utilities are not ordered 
(cherry picked from commit acc3a6bcfd)
 2024-03-11 12:42:18 +08:00
shizhong 88d3a47b18 BUG 2024-03-08 22:00:26 +08:00
AKING af5ef1f287 update src/permission.ts. 
解决了跳转不带参数的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 024d08555b)
 2024-03-08 21:46:50 +08:00
AKING a81b4f6b06 update src/components/Descriptions/src/Descriptions.vue. 
字段映射的功能点添加，已测

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 24062c7a3b)
 2024-03-08 21:45:11 +08:00
AKING 5dc7f8b595 update src/types/descriptions.d.ts. 
此处添加了字段映射字段，方便在description在展示的时候减少slot的使用使用方式如下

// 确认人 confirmUser
  {
    label: '确认人',
    field: 'confirmUser',
    minWidth: 120,
    isForm: false,
    isDetail: true,
    detail: {
      mappedField: 'confirmUserName'
    }
  },

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 530107eba7)
 2024-03-08 21:45:06 +08:00
YunaiV a1635da641 CRM：code review 跟进记录， 
(cherry picked from commit 66ff10d00c)
 2024-03-08 21:44:51 +08:00
min 90743cdb85 CRM：线索创建时增加负责人选择框 
(cherry picked from commit e0bc3ea6dc)
 2024-03-08 21:44:35 +08:00
min d7209882b8 CRM：线索表单去掉客户字段 
(cherry picked from commit 3471b5c5b2)
 2024-03-08 21:44:24 +08:00
dhb52 a3d7efa669 refactor: 提取公共选项定义 
(cherry picked from commit c38bbb99a1)
 2024-03-08 21:44:13 +08:00
dhb52 f8e13a5ccd feat: backlog 分配给我的线索、客户 
(cherry picked from commit 7c0c651592)
 2024-03-08 21:43:34 +08:00
puhui999 ba4a848fa8 fix: 修复 CRM 的一些 bug 
(cherry picked from commit d735f782fc)
 2024-03-08 21:43:26 +08:00
puhui999 c8e8ebf025 CRM: 跟进组件完善 
(cherry picked from commit 9628517b8b)
 2024-03-08 21:43:16 +08:00
puhui999 3fec9de1cf 多图上传组件优化 
(cherry picked from commit f88b26e3c3)
 2024-03-08 21:43:09 +08:00
YunaiV cfd454b989 ✨ PAY：增加钱包、微信条码支付的渠道配置界面 
(cherry picked from commit 948ef08533)
 2024-03-08 21:42:58 +08:00
YunaiV 45f96650f0 BPM：抄送任务的 code review 
(cherry picked from commit bf3e051d74)
 2024-03-08 21:42:46 +08:00
YunaiV d8c15b3aa7 ✨ 调整启动命令，恢复 npm run dev；如果要连接远程服务 
(cherry picked from commit 2dcd131097)
 2024-03-08 21:41:51 +08:00
kyle dccd2d7d4a feat: 新增流程抄送 
(cherry picked from commit 2c9393702d)
 2024-03-08 21:40:23 +08:00
dhb52 743ac20538 wip: CRM-代办消息-添加其他页面草稿 
(cherry picked from commit 040b80b35f)
 2024-03-08 21:36:26 +08:00
dhb52 65ee931335 wip: CRM-代办消息-修改模块为backlog 
(cherry picked from commit 48693b50f2)
 2024-03-08 21:36:23 +08:00
YunaiV 748eb2b576 📖 CRM：跟进记录的 code review 
(cherry picked from commit 9fa769b16a)
 2024-03-08 21:36:13 +08:00
YunaiV d9c8135bd8 📖 CRM：待办事项的 code review 
(cherry picked from commit 1e70a1d57e)
 2024-03-08 21:35:46 +08:00
dhb52 811be75681 wip: 待办事项 
(cherry picked from commit 24849335a8)
 2024-03-08 21:35:27 +08:00
puhui999 6754fe06c2 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-08 21:35:05 +08:00
puhui999 d5be5f35a8 crm-客户：完善转移和按钮权限 
(cherry picked from commit 9cbb3aa84a)
 2024-03-08 21:30:50 +08:00
puhui999 7a8f9b3742 crm-客户：公海抽离，完善跟进 
(cherry picked from commit 5151824110)
 2024-03-08 21:30:24 +08:00
puhui999 bb694349f1 新增客户跟进 
(cherry picked from commit d29dfef7c7)
 2024-03-08 21:27:10 +08:00
YunaiV 68aed119dd ✨ MALL：简化商品分类的 VO 转化 
(cherry picked from commit 26bb847383)
 2024-03-08 21:26:43 +08:00
shizhong 231ba51650 📖 CRM：产品模块的 review 2024-03-08 21:24:00 +08:00
YunaiV f2fcaf0eb3 ✨ MALL：简化 SPU 属性的维护逻辑 
(cherry picked from commit a9400c5171)
 2024-03-08 21:15:22 +08:00
YunaiV 92d3564cae 📖 MALL：商品编辑 => 优化 DescriptionForm 表单 
(cherry picked from commit 10afbe8e2f)
 2024-03-08 21:15:17 +08:00
YunaiV 890d31ff5f 📖 MALL：商品编辑 => 优化 DeliveryForm 表单 
(cherry picked from commit a38ddb699a)
 2024-03-08 21:15:13 +08:00
YunaiV 48fe4332bc 📖 MALL：商品编辑 => 优化 SKU 表单 
(cherry picked from commit 20b4a7fd66)
 2024-03-08 21:14:52 +08:00
anhaohao d352e022b6 新增：产品详情页面 
(cherry picked from commit 4f89eb6ba9)
 2024-03-08 21:14:46 +08:00
owen a959935cf8 Review代码修改 
(cherry picked from commit 2b8eb49f71)
 2024-03-08 21:14:40 +08:00
owen ae2209a53e 营销：统一装修预览图片字段名称 
(cherry picked from commit a9c231bed6)
 2024-03-08 21:14:10 +08:00
YunaiV d1c9f702d9 📖 MALL：商品编辑 => 简化 InfoForm 基础设置 
(cherry picked from commit efe702d383)
 2024-03-08 21:13:52 +08:00
YunaiV ddcf1f672b 📖 MALL：商品编辑 => 将 detail 还是使用 form 复用，减少维护成本 
(cherry picked from commit 2c76d3aeee)
 2024-03-08 21:13:46 +08:00
YunaiV 135f4803b1 📖 MALL：商品编辑的简化 
(cherry picked from commit c0905fdc8e)
 2024-03-08 21:13:38 +08:00
YunaiV ac0efcd9b5 📖 MALL：商品编辑的简化 
(cherry picked from commit f1c858b9af)
 2024-03-08 21:13:18 +08:00
YunaiV bb45bfd4c6 📖 MALL：优化商品列表的样式 
(cherry picked from commit a5d6d18b6a)
 2024-03-08 21:12:45 +08:00
YunaiV 642ba23160 📖 MALL：code review 满减送活动 
(cherry picked from commit ab64a1d1df)
 2024-03-08 21:12:20 +08:00
YunaiV f8b0250def 📖 CRM：code review crm 客户列表 
(cherry picked from commit ec87c1b61d)
 2024-03-08 21:12:10 +08:00
YunaiV 65e6465a7a 📖 CRM：code review crm 联系人新增操作日志 
(cherry picked from commit a0f7775321)
 2024-03-08 21:11:58 +08:00
YunaiV f4792d9b08 📖 MALL：code review 商品统计的代码 
(cherry picked from commit 29e7161eba)
 2024-03-08 21:11:52 +08:00
zyna dd0a9781a1 crm联系人新增操作日志 
(cherry picked from commit 3af6811c72)
 2024-03-08 21:11:30 +08:00
answer-huang 187368bcc8 fix: remove bg color with xl size 
(cherry picked from commit 8801c82e15)
 2024-03-08 21:11:19 +08:00
puhui999 b211e245db 客户详情完善 
(cherry picked from commit 17be1abb65)
 2024-03-08 21:11:08 +08:00
YunaiV 9286010e77 ✨ MALL：去除分销提现的银行配置 
(cherry picked from commit d36c4ab36c)
 2024-03-08 21:11:01 +08:00
shizhong 9e0e307d74 update src/views/bpm/model/ModelForm.vue. 创建的是用路由地址，但那个表单查看的是VUE源码的组件地址，不是路由。给我造成了很大的困扰~ 2024-03-08 21:09:06 +08:00
puhui999 4ddf19a601 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题 
(cherry picked from commit 7fd564307d)
 2024-03-08 21:04:38 +08:00
YunaiV 712a7df176 ✨ CRM：【联系人】统一字段 
(cherry picked from commit 5e265a9094)
 2024-03-08 21:04:15 +08:00
YunaiV d991d92cfc 📖 CRM：【客户配置】调整目录结构 
(cherry picked from commit d71097ac31)
 2024-03-08 21:04:11 +08:00
YunaiV 26faf5bdfd 📖 CRM：【客户】微调客户列表界面 
(cherry picked from commit 4fbb3b88e6)
 2024-03-08 21:04:08 +08:00
YunaiV 6de158bb54 📖 CRM：【客户】微调客户列表界面 
(cherry picked from commit 7448f6e08c)
 2024-03-08 21:04:05 +08:00
YunaiV 08a6ecefb1 📖 CRM：code review 商机模块 
(cherry picked from commit 0a4023ef00)
 2024-03-08 21:03:55 +08:00
YunaiV 6fe6e51b2f 📖 操作日志的界面实现 
(cherry picked from commit 1eefa02c4c)
 2024-03-08 21:03:11 +08:00
shizhong e2359633dd fix: 修复请假申请提交后页面不返回的bug 2024-03-08 21:00:35 +08:00
YunaiV ce62ded6b6 🐛 修复 Excel 导出失败时，依然下载的问题 
(cherry picked from commit ccb997ac2a)
 2024-03-08 20:54:22 +08:00
puhui999 c124ca4879 fix: 修复文件上传数据回显错误 
(cherry picked from commit aadad39a69)
 2024-03-08 20:54:03 +08:00
puhui999 2b1c12eb4b crm-客户：集成操作日志详情组件 
(cherry picked from commit 261d8b2aa4)
 2024-03-08 20:53:54 +08:00
落日晚风 62b9002cf6 满减送数据对接 
(cherry picked from commit 21e8dbf985)
 2024-03-08 20:53:30 +08:00
YunaiV b890915539 📖 code review：店铺装修逻辑 
(cherry picked from commit 9591ed7084)
 2024-03-08 20:53:04 +08:00
YunaiV c57db2bf09 📖 code review：店铺装修逻辑 
(cherry picked from commit b86f082306)
 2024-03-08 20:52:59 +08:00
zyna b22e361eaa crm联系人商机修改 
(cherry picked from commit 2cfe006def)
 2024-03-08 20:52:56 +08:00
zyna d6c56f8588 crm联系人商机修改 
(cherry picked from commit dd4482fad2)
 2024-03-08 20:52:53 +08:00
zyna d6a4795ca4 crm联系人商机修改 
(cherry picked from commit a1fd3afc32)
 2024-03-08 20:52:47 +08:00
owen cae1d7cb1a 统计：增加商品统计 
(cherry picked from commit ca35e1a4af)
 2024-03-08 20:52:15 +08:00
水人 96fae4f3ea update src/api/bpm/task/index.ts. 
后台接口地址是return-list，前台写成了get-return-list

Signed-off-by: 水人 <417693680@qq.com>
(cherry picked from commit 346863a8a9)
 2024-03-08 20:51:45 +08:00
owen f07b7dbbb0 营销：优化商城装修组件 
(cherry picked from commit 80355f3acd)
 2024-03-08 20:51:29 +08:00
owen 6a7c04db5e 营销：适配商城装修组件【标题栏】 
(cherry picked from commit 33162a12c0)
 2024-03-08 20:51:24 +08:00
owen 67b24d61b6 营销：适配商城装修组件【热区】 
(cherry picked from commit 41a404a52c)
 2024-03-08 20:51:14 +08:00
puhui999 5ab56e3fff crm-客户：集成操作日志详情组件 
(cherry picked from commit 455688eaa8)
 2024-03-08 20:50:56 +08:00
puhui999 f9c272ad0d feat：新增公共操作日志详情组件 
(cherry picked from commit 59c6670775)
 2024-03-08 20:50:45 +08:00
owen 156e7ccb53 营销：适配商城装修组件【悬浮按钮】 
(cherry picked from commit edfdee8cc1)
 2024-03-08 20:48:47 +08:00
owen 5d527672a1 营销：适配商城装修组件【弹窗广告】 
(cherry picked from commit 76025b6821)
 2024-03-08 20:48:35 +08:00
owen 91db4949d5 封装拖拽组件，提供移动、新增、删除功能 
(cherry picked from commit 59ff6b13fb)
 2024-03-08 20:48:27 +08:00
shizhong f0f75fac0c BUG 2024-03-08 20:45:43 +08:00
shizhong d1cfe78283 BUG 2024-03-07 14:09:08 +08:00
owen 2438f65d9e 商城装修：修复同一类型的组件切换时，右侧属性面板不更新的问题 
(cherry picked from commit 9ff4f1f7a9)
 2024-03-07 13:10:11 +08:00
owen 9ce5e4a178 修复商城首页，快捷入口的图标宽高不一致的问题 
(cherry picked from commit a7512ba2c7)
 2024-03-07 13:10:06 +08:00
owen 57fcddd6c7 营销：完善装修编辑器预览功能 
(cherry picked from commit cd89f75b07)
 2024-03-07 13:05:29 +08:00
owen 59ebc1ea8f 营销：完善装修编辑器预览功能 
(cherry picked from commit 784623724d)
 2024-03-07 13:05:23 +08:00
owen 898faf0999 营销：完善装修编辑器重置功能 
(cherry picked from commit eec3a21852)
 2024-03-07 13:05:16 +08:00