Commits · 683f79ddb35d5bf1adbd47b51c0f1d19c766406a · lanbaoming / jiedao-app-operator-master

26 Aug, 2024 4 commits
- 客户详情报价标签加查询条件 · 683f79dd
  yujinyao authored Aug 26, 2024
  
  683f79dd
- en_US.json和dict.js文件冲突 · 7e0c1c55
  yujinyao authored Aug 26, 2024
  
  7e0c1c55
- 客户详情订单tag增加查询条件 · a378af4f
  yujinyao authored Aug 26, 2024
  
  a378af4f
- 修改用户信息 · 4fda88f1
  yujinyao authored Aug 26, 2024
  
  4fda88f1
23 Aug, 2024 7 commits
- Merge branch 'feature/order' into dev · 0f782c13
  dragondean@qq.com authored Aug 23, 2024
  
  0f782c13
- 完善创建订单页面重构 · 63d7948d
  dragondean@qq.com authored Aug 23, 2024
  
  63d7948d
- 修改客户详情字段 · 29dfe086
  yujinyao authored Aug 23, 2024
  
  29dfe086
- Merge branch 'feature/order' into dev · 75e7b892
  dragondean@qq.com authored Aug 23, 2024
  
  75e7b892
- 创建订单页面更新 · 3f7eebc9
  dragondean@qq.com authored Aug 23, 2024
  
  3f7eebc9
- Merge remote-tracking branch 'origin/dev' into dev · 62631135
  dragondean@qq.com authored Aug 23, 2024
  
  62631135
- 修复海运价格编辑全包阶梯价提交异常 · 2b51f62a
  dragondean@qq.com authored Aug 23, 2024
  
  2b51f62a
21 Aug, 2024 9 commits
- 客户信息字段确认 · 8c128ec8
  yujinyao authored Aug 21, 2024
  
  8c128ec8
- Merge branch 'feature/099_customer_filter' into 'dev' · 17e03f4f
  chenwei authored Aug 21, 2024
```
兑换导入错误信息

See merge request !15
```
  17e03f4f
- 兑换导入错误信息 · f43e0d6a
  chenwei authored Aug 21, 2024
  
  f43e0d6a
- Merge branch 'feature/099_customer_filter' into 'dev' · d2906346
  chenwei authored Aug 21, 2024
```
fixed defect 103 | 104 |1 05 |1 06 | 107 | 108 | 109 |110

See merge request !14
```
  d2906346
- fixed defect 103 | 104 |1 05 |1 06 | 107 | 108 | 109 |110 · f6cc0a25
  chenwei authored Aug 21, 2024
  
  f6cc0a25
- Merge branch 'fix/price_query' into dev · 788e4ee6
  dragondean@qq.com authored Aug 21, 2024
```
# Conflicts:
#	src/views/ecw/order/prepayDeal.vue
```
  788e4ee6
- 单询异常处理不可发不显示价格表单项 · f3dcd007
  dragondean@qq.com authored Aug 21, 2024
  
  f3dcd007
- 单询异常支持修改付款方式和价格模式 · 4ced5f1e
  dragondean@qq.com authored Aug 21, 2024
  
  4ced5f1e
- 单询异常支持修改付款方式和价格模式 · f9afc26f
  dragondean@qq.com authored Aug 21, 2024
  
  f9afc26f
20 Aug, 2024 6 commits
- Merge branch 'fix/price_query' into dev · c9d7371e
  dragondean@qq.com authored Aug 20, 2024
  
  c9d7371e
- 价格为0的单询异常可以修改单位 · 79ad5b69
  dragondean@qq.com authored Aug 20, 2024
  
  79ad5b69
- 修改客户相关信息字段 · eeea2886
  yujinyao authored Aug 20, 2024
  
  eeea2886
- 海运价格编辑单询不校验价格 · c886d29c
  dragondean@qq.com authored Aug 20, 2024
  
  c886d29c
- Merge branch 'feature/099_customer_filter' into 'dev' · add76b69
  chenwei authored Aug 20, 2024
```
积分记录检索件修改

See merge request !13
```
  add76b69
- 积分记录检索件修改 · c3b09cbb
  chenwei authored Aug 20, 2024
  
  c3b09cbb
19 Aug, 2024 5 commits
- Merge branch 'feature/099_customer_filter' into 'dev' · 73a49f9d
  chenwei authored Aug 19, 2024
```
展示平台组件更新

See merge request !12
```
  73a49f9d
- 展示平台组件更新 · 664cc2d7
  chenwei authored Aug 19, 2024
  
  664cc2d7
- 客户详情页面字段调整 · 82936447
  yujinyao authored Aug 19, 2024
  
  82936447
- Merge branch 'feature/099_customer_filter' into 'dev' · 36ee0c75
  chenwei authored Aug 19, 2024
```
积分规则按钮操作

See merge request !11
```
  36ee0c75
- 积分规则按钮操作 · 1c1eb3bf
  chenwei authored Aug 19, 2024
  
  1c1eb3bf
16 Aug, 2024 7 commits
- Merge branch 'feature/099_customer_filter' into 'dev' · 5b1c0b6c
  chenwei authored Aug 16, 2024
```
Feature/099 customer filter

See merge request !10
```
  5b1c0b6c
- fixed exchange page route · 08f05269
  chenwei authored Aug 16, 2024
  
  08f05269
- fixed time data clear · 06c1c002
  chenwei authored Aug 16, 2024
  
  06c1c002
- Merge branch 'feature/099_customer_filter' into 'dev' · 74f41a84
  chenwei authored Aug 16, 2024
```
ExCHANGE SUCCESSS GO BACK

See merge request !9
```
  74f41a84
- ExCHANGE SUCCESSS GO BACK · 957f5743
  chenwei authored Aug 16, 2024
  
  957f5743
- Merge branch 'feature/099_customer_filter' into 'dev' · 0503c499
  chenwei authored Aug 16, 2024
```
Fixed gift redemption verification rules

See merge request !8
```
  0503c499
- Fixed gift redemption verification rules · c2a57a4f
  chenwei authored Aug 16, 2024
  
  c2a57a4f
15 Aug, 2024 2 commits
- Merge branch 'feature/099_customer_filter' into 'dev' · 496bf1a6
  chenwei authored Aug 15, 2024
```
fix excahange record operation page--- "select gift is required"

See merge request !7
```
  496bf1a6
- fix excahange record operation page--- "select gift is required" · 0cc32818
  chenwei authored Aug 15, 2024
  
  0cc32818