Sign in

canrd-main / canrd-erp-front · Commits

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Commits 614
  • Compare
  • Branches 6
  • Tags 1
  • canrd-erp-front
11 Dec, 2024
1 commit
  • Merge branch 'clienetAdd'
      d76063bf
    PurelzMgnead authored
    2024-12-11 08:50:32 +0800  
    Browse Code »

10 Dec, 2024
3 commits
  • feat: 售后
      27662ea9
    PurelzMgnead authored
    2024-12-10 15:32:13 +0800  
    Browse Code »
  • feat(Order): 添加惠州市坚途新材料科技有限公司账户 ...
      f9c33b88
    在 constant.ts 文件中添加了新的公司账户信息:
    HUIZHOU_JIANTU_PUBLIC_ACCOUNT: '惠州市坚途新材料科技有限公司'
    曾国涛 authored
    2024-12-10 15:27:53 +0800  
    Browse Code »
  • Merge branch 'warningNew' ...
    d69062ec
    # Conflicts:
    #	src/pages/Order/Order/index.tsx
    曾国涛 authored
    2024-12-10 08:24:20 +0800  
    Browse Code »

09 Dec, 2024
3 commits
  • fix: 修改预警参数
      8534395e
    boyang authored
    2024-12-09 15:19:11 +0800  
    Browse Code »
  • fix: 修改预警参数
      ba39c9d2
    boyang authored
    2024-12-09 14:43:41 +0800  
    Browse Code »
  • feat: 售后
      9501262e
    PurelzMgnead authored
    2024-12-09 13:57:50 +0800  
    Browse Code »

06 Dec, 2024
4 commits
  • Merge remote-tracking branch 'origin/warningNew' into clienetAdd
    0cbf10f0
    PurelzMgnead authored
    2024-12-06 15:21:02 +0800  
    Browse Code »
  • feat: 添加关联销售
      d5a14e93
    PurelzMgnead authored
    2024-12-06 15:03:17 +0800  
    Browse Code »
  • Merge remote-tracking branch 'origin/master'
      9c4a4924
    曾国涛 authored
    2024-12-06 10:34:17 +0800  
    Browse Code »
  • feat(Order): 增加官网订单支付状态变更提示 ...
    991063b8
    - 在订单抽屉中添加关于官网订单支付状态的提示信息
    - 当订单状态从已付款改为其他状态时,提示用户这将影响财务模块的自动核销
    - 当订单状态改为已付款时,提示用户该订单将在财务模块中自动核销
    - 优化了支付方式选择框的显示逻辑
    曾国涛 authored
    2024-12-06 10:32:38 +0800  
    Browse Code »

05 Dec, 2024
1 commit
  • feat: 将订单列表转换为组件
      6a6bf420
    boyang authored
    2024-12-05 17:35:44 +0800  
    Browse Code »

29 Nov, 2024
2 commits
  • feat: 添加关联销售
      ca02506c
    PurelzMgnead authored
    2024-11-29 16:36:51 +0800  
    Browse Code »
  • fix: 修改客户列表默认字体
      823316f4
    boyang authored
    2024-11-29 14:06:22 +0800  
    Browse Code »

21 Nov, 2024
1 commit
  • Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front
    b9d8e000
    曾国涛 authored
    2024-11-21 12:33:03 +0800  
    Browse Code »

18 Nov, 2024
1 commit
  • feat: update工单管理
      ffece678
    PurelzMgnead authored
    2024-11-18 09:49:53 +0800  
    Browse Code »

16 Nov, 2024
3 commits
  • Merge remote-tracking branch 'origin/master'
    2ebc03ac
    曾国涛 authored
    2024-11-16 22:39:41 +0800  
    Browse Code »
  • fix: 跟进记录根据状态禁止工单编辑
      cba8c9ea
    boyang authored
    2024-11-16 15:55:07 +0800  
    Browse Code »
  • Merge remote-tracking branch 'origin/master'
      978db6d6
    boyang authored
    2024-11-16 12:02:30 +0800  
    Browse Code »

15 Nov, 2024
1 commit
  • refactor(access): 调整订单预警和客户管理权限 ...
    49b79eb8
    - 订单预警权限调整为 admin 和 sales
    - 客户管理权限调整为 admin、sales 和 warehouseKeeper
    - 重构部分组件代码,优化功能实现
    曾国涛 authored
    2024-11-15 17:15:18 +0800  
    Browse Code »

11 Nov, 2024
7 commits
  • feat: update工单管理
      903be55b
    PurelzMgnead authored
    2024-11-11 15:58:04 +0800  
    Browse Code »
  • feat: update工单管理
      1d1d373d
    PurelzMgnead authored
    2024-11-11 15:43:15 +0800  
    Browse Code »
  • Merge branch 'clientBy'
    e5743afc
    boyang authored
    2024-11-11 14:38:54 +0800  
    Browse Code »
  • fix: 修改字段名
      a1ae730f
    boyang authored
    2024-11-11 14:37:16 +0800  
    Browse Code »
  • feat: update工单管理
      48b5692b
    PurelzMgnead authored
    2024-11-11 11:27:02 +0800  
    Browse Code »
  • feat: update工单管理
      49420e4e
    PurelzMgnead authored
    2024-11-11 11:10:18 +0800  
    Browse Code »
  • feat: update工单管理
    5c9f820c
    PurelzMgnead authored
    2024-11-11 11:07:21 +0800  
    Browse Code »

08 Nov, 2024
2 commits
  • fix: 客户列表添加创建人
      a4726bc2
    boyang authored
    2024-11-08 15:33:46 +0800  
    Browse Code »
  • fix: 修改附件组件
      5213ab60
    boyang authored
    2024-11-08 15:21:57 +0800  
    Browse Code »

07 Nov, 2024
7 commits
  • fix: 修改弹窗bug
      0a62353d
    boyang authored
    2024-11-07 11:53:09 +0800  
    Browse Code »
  • fix: 修改工单类型
      dd688b92
    boyang authored
    2024-11-07 11:28:07 +0800  
    Browse Code »
  • Merge branch 'master' into clientBy ...
    180c35a6
    # Conflicts:
    #	.umirc.ts
    #	src/pages/Order/Order/index.tsx
    boyang authored
    2024-11-07 11:02:04 +0800  
    Browse Code »
  • fix: 修改客户管理/跟进记录
      3b4f6ce8
    boyang authored
    2024-11-07 10:59:22 +0800  
    Browse Code »
  • fix: 修改客户管理/跟进记录
      bf221616
    boyang authored
    2024-11-07 10:49:44 +0800  
    Browse Code »
  • fix: 修改客户管理/跟进记录
      a065692b
    boyang authored
    2024-11-07 10:34:31 +0800  
    Browse Code »
  • fix: 修改客户管理/跟进记录
      cf0ac7a5
    boyang authored
    2024-11-07 10:33:06 +0800  
    Browse Code »

05 Nov, 2024
1 commit
  • refactor(Invoice): 优化发票相关功能 ...
      27b7cbf1
    - 在 Invoice constant.tsx 中添加主订单 ID 字段
    - 在 Order/Order/components/InvoicingDrawerForm.tsx 中:
      - 优化金额计算,使用 FloatMul 替代直接乘法
      - 添加单位输入框
    曾国涛 authored
    2024-11-05 17:04:06 +0800  
    Browse Code »

04 Nov, 2024
2 commits
  • Merge remote-tracking branch 'origin/warning'
    dabb9fcf
    曾国涛 authored
    2024-11-04 14:08:15 +0800  
    Browse Code »
  • fix: 预警弹窗权限
      5aac1aa7
    boyang authored
    2024-11-04 13:43:19 +0800  
    Browse Code »

01 Nov, 2024
1 commit
  • Merge remote-tracking branch 'origin/warning'
    00350652
    曾国涛 authored
    2024-11-01 16:09:55 +0800  
    Browse Code »