hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-11-04 20:28:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,289 Commits 8 Branches 0 Tags
af7c6f3b2c05bd5ed352b2ccc0c610b4be450c30
Commit Graph

1289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
puhui999
01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
puhui999
18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
YunaiV
2457665b55 code review：门店自提 2023-10-20 09:46:15 +08:00
芋道源码
826199dc22 !281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 
Merge pull request !281 from 陈晨成/master
 2023-10-19 16:25:00 +00:00
芋道源码
83501f9b09 !279 交易：核销订单 
Merge pull request !279 from 疯狂的世界/dev
 2023-10-19 16:06:33 +00:00
芋道源码
6dc7315e17 !280 feat: CRM 线索表 crud 
Merge pull request !280 from wanwan/master
 2023-10-19 15:16:34 +00:00
1351515658@qq.com
3074adb1df fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 2023-10-19 18:43:02 +08:00
puhui999
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
puhui999
5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
puhui999
094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
puhui999
70778fd9e6 UserOrderList 重构完善 2023-10-19 10:54:10 +08:00
puhui999
5270c83876 订单列表：完善表头宽度自适应 2023-10-19 10:36:52 +08:00
913752709@qq.com
7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
puhui999
04d88ce1a6 订单列表：自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
puhui999
d1a3fe5d5a 营销文章：新增表单属性移除浏览量 2023-10-18 11:33:42 +08:00
owen
ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen
431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
owen
61b3bdfd4c 交易：核销订单 2023-10-17 23:18:07 +08:00
芋道源码
d6b0305d78 !277 修复前端支付渠道配置权限 
Merge pull request !277 from 小玩家/master
 2023-10-17 14:55:14 +00:00
YunaiV
8832eafaae code review：crm 合同流程 2023-10-17 22:52:24 +08:00
1163996518@qq.com
533b4e5006 支付渠道配置--修复权限 2023-10-17 21:27:13 +08:00
1163996518@qq.com
d5328918ab 支付渠道配置--修复权限 2023-10-17 20:58:28 +08:00
芋道源码
40ec1b08ae !275 Review代码修改 
Merge pull request !275 from 疯狂的世界/dev
 2023-10-17 12:52:28 +00:00
芋道源码
0089d59d36 !274 CRM/合同管理 CRUD初稿 
Merge pull request !274 from dhb52/master
 2023-10-17 12:01:51 +00:00
YunaiV
c27685285a code review：修复工作流的审批界面报错问题 2023-10-17 19:50:09 +08:00
YunaiV
63fd52828c Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 19:03:02 +08:00
YunaiV
aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/views/mall/statistics/member/index.vue
 2023-10-17 19:02:37 +08:00
芋道源码
0242c84196 !267 【工作流】加签和减签 
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
 2023-10-17 11:01:18 +00:00
owen
57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00
owen
6fc232b758 交易：订单核销 2023-10-17 16:09:36 +08:00
dhb52
dced551698 feat: CRM/合同 crud 2023-10-16 23:56:34 +08:00
jason
c3f06f5fbe 钱包 - 钱包余额流水 2023-10-16 22:45:32 +08:00
jason
8626bccc4c 钱包 - 钱包余额流水 2023-10-16 22:32:10 +08:00
jason
ae2c3f2ad5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 22:27:39 +08:00
owen
e3a0cfe5e9 统计：修复错误 2023-10-16 22:18:51 +08:00
owen
6204ce6c1b 统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen
cd4b4cd322 统计：Review修改 2023-10-16 22:03:36 +08:00
YunaiV
66ec610801 code review：文章管理 2023-10-16 21:55:11 +08:00
芋道源码
7b9ea62e6b !273 商城首页 
Merge pull request !273 from 疯狂的世界/dev
 2023-10-16 12:11:23 +00:00
xingyu
8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
xingyu
5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
xingyu
1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
xingyu
42c8db4f34 chore: update deps 2023-10-16 15:03:55 +08:00
owen
edfd03903f 统计：会员终端统计，处理未知终端情况 2023-10-16 14:26:04 +08:00
owen
2bfc9c3b13 统计：处理会员性别统计，存在未知的情况 2023-10-16 13:25:15 +08:00
owen
661e72bcfd 统计：修复错误 2023-10-16 13:15:17 +08:00
owen
8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen
e1a72779d4 统计：Review修改 2023-10-16 13:00:13 +08:00
xingyu
a2ded16718 docs: element plus 2.4.0 2023-10-16 10:25:24 +08:00
xingyu
de3fa7a765 chore: update deps 2023-10-16 10:24:35 +08:00