ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,090 Commits 2 Branches 0 Tags 129 MiB
28f14ad68e
Commit Graph

141 Commits

Author SHA1 Message Date
wjh
29d25466bd fix: 修改结算单人工录入计算逻辑 (#1007) 
Reviewed-on: daoyoucloud/tachybase#1007
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-05-17 17:57:07 +08:00
sealday
9ba7c8f3c3 feat: 支持新样式配置 (#1000) 
Reviewed-on: daoyoucloud/tachybase#1000
 2024-05-16 19:01:26 +08:00
wjh
87245462e2 fix: 修改结算单报错问题 (#998) 
Reviewed-on: daoyoucloud/tachybase#998
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-05-16 16:48:45 +08:00
sealday
0602743922 revert: old rental (#983) 
Reviewed-on: daoyoucloud/tachybase#983
 2024-05-14 18:20:08 +08:00
wjh
b762282578 fix: 统一注释改成备注合并 (#977) 
Reviewed-on: daoyoucloud/tachybase#977
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-05-10 18:28:40 +08:00
hello@lv
d21d032c11 feat: fix 模版报错报错 (#971) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#971
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-05-10 14:30:50 +08:00
wjh
2b0e1fa573 fix: 修改录单的维修赔偿级联点击能显示名称，修改级联组价查看显示标题 (#958) 
Reviewed-on: daoyoucloud/tachybase#958
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-05-09 23:02:57 +08:00
hello@lv
c6fdba41e6 feat_check_fill (#954) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#954
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-05-09 20:12:59 +08:00
wjh
424c109b25 fix: 修改合同筛选方案明细的条件 (#950) 
Reviewed-on: daoyoucloud/tachybase#950
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-05-09 16:05:57 +08:00
sealday
3bf232d952 fix: view contract (#949) 
Reviewed-on: daoyoucloud/tachybase#949
 2024-05-09 15:34:40 +08:00
sealday
882a1a95a5 feat: support view contracts (#947) 
Reviewed-on: daoyoucloud/tachybase#947
 2024-05-09 14:15:47 +08:00
wjh
5a15fd1ff1 fix: 修改录单时产品没有合同显示全部 (#946) 
Reviewed-on: daoyoucloud/tachybase#946
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-05-09 12:25:07 +08:00
hello@lv
3067484120 fix: 处理调拨单类型显示不正确问题 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#938
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-05-09 10:43:24 +08:00
sealday
2880203b99 feat: contract date range (#939) 
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#939
 2024-05-09 01:32:17 +08:00
hello@lv
11e235b429 fix: 出入库查询视图 (#936) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#936
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-05-08 23:08:59 +08:00
hello@lv
62bfe29825 feat_check_fill (#932) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#932
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-05-08 21:33:44 +08:00
hello@lv
7aafd496ab feat: 二期调整 (#926) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#926
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-05-08 19:04:48 +08:00
sealday
3e58c54aa8 feat: 仓库二期 (#719) 
Co-authored-by: hello@lv <2256334253@qq.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#719
 2024-05-08 16:20:31 +08:00
bai.zixv
e95ce7186c feat: plugin-rental, support calc tax ,filter by category (#909) 
视图更新. 上线后需要线上执行视图sql

Reviewed-on: daoyoucloud/tachybase#909
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
 2024-05-06 18:52:43 +08:00
sealday
8c156c35d2 refactor: @hera/plugin-core @tachybase/schema, remove unused plugin-charts (#887) 
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#887
 2024-04-29 21:41:13 +08:00
sealday
486a08d75e feat: support-business-fields (#879) 
Reviewed-on: daoyoucloud/tachybase#879
 2024-04-28 17:38:07 +08:00
sealday
174f1464fa feat: support business fields (#877) 
Reviewed-on: daoyoucloud/tachybase#877
 2024-04-28 17:30:39 +08:00
bai.zixv
b3724d49d5 fix: sql, view_invoices_tax, convert the month of result to utc (#859) 
1. 将视图的返回结果日期, 统一为utc时间, 消除日期歧义.
2. 明确指出视图返回字段.
3. 视图结果,按照业务习惯,先按照最新日期排列

Note: 更新后,需要刷新线上数据库视图, 当然对目前线上无影响, 只是消除日期隐患.

Reviewed-on: daoyoucloud/tachybase#859
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
 2024-04-25 20:51:27 +08:00
bai.zixv
9f215c76e8 fix: plugin-rental,view_invoices_taxs-sql, date zone set shanghai (#849) 
Reviewed-on: daoyoucloud/tachybase#849
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
 2024-04-25 15:02:09 +08:00
hello@lv
2aa08c4598 feat: 订单修改结算单状态未改变 close #847 (#848) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#848
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-25 15:00:01 +08:00
wjh
a30a214ac0 fix: 筛选结算单订单类型只有租赁类型 (#829) 
Reviewed-on: daoyoucloud/tachybase#829
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-24 11:26:15 +08:00
sealday
6bb7e40f7a perf: optimize pdf load (#827) 
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#827
 2024-04-24 03:29:59 +08:00
sealday
58a799aea4 fix: old version get stream (#825) 
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#825
 2024-04-24 02:58:22 +08:00
sealday
068b44793c feat: record pdf cache (#823) 
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#823
 2024-04-24 02:39:51 +08:00
wjh
eeed385ea1 fix: 结算表无关联费用支持其他类型 (#799) 
Co-authored-by: sealday <zhanglin@daoyoucloud.com>
Reviewed-on: daoyoucloud/tachybase#799
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-22 17:36:45 +08:00
wjh
75b4dae712 fix: 结算表本期明细显示数量为0的内容 (#796) 
Co-authored-by: sealday <zhanglin@daoyoucloud.com>
Reviewed-on: daoyoucloud/tachybase#796
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-22 16:26:52 +08:00
wjh
95fc2c4e16 fix: 结算单显示具体规格逻辑修复 (#770) 
Reviewed-on: daoyoucloud/tachybase#770
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-19 14:17:03 +08:00
wjh
b5b7ce6b8c fix: 结算单录单模块调整后没有显示录在明细中的无关联费用 close #764 (#765) 
Reviewed-on: daoyoucloud/tachybase#765
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-19 05:04:54 +08:00
hello@lv
4b3886b072 fix_contract_no_products_assfees (#759) 
Co-authored-by: lyx <2027667395@qq.com>
Co-authored-by: sealday <zhanglin@daoyoucloud.com>
Reviewed-on: daoyoucloud/tachybase#759
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-18 15:36:30 +08:00
hello@lv
e230ea5586 feat: 合同费用校验（无产品关联先跳过）clost #756 (#757) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#757
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-18 14:45:55 +08:00
wjh
0da2e5f890 fix: 修改结算单合并规则的订单数量不对 (#734) 
Reviewed-on: daoyoucloud/tachycode#734
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-16 18:18:20 +08:00
hello@lv
c92e1953d3 feat: 运输单分组计算接口 feat #726 (#728) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachycode#728
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-16 15:01:00 +08:00
wjh
2021230f50 feat: 结算单预览添加订单数量字段 (#716) 
Reviewed-on: daoyoucloud/tachycode#716
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-15 19:42:49 +08:00
hello@lv
0e97825b13 fix: 合同结算单结束时间加一天减一毫秒，取当天的结束时间 (#711) 
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachycode#711
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-15 17:53:14 +08:00
bai.jingfeng
a87d95210c refactor: excel 部分重构，优化弹窗体验 (#598) 
Reviewed-on: daoyoucloud/tachycode#598
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
 2024-04-15 05:55:39 +08:00
wjh
122d5ab9ac fix:修改结算单导出Excel名称 (#697) fix #696 
<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->

# Description
<!-- Describe the new feature or modification to an existing feature clearly and consciously. -->

# Motivation
<!-- Explain the reason for adding or modifying this feature. -->

# Key changes
<!-- Provide a technically detailed description of the key changes made. -->
- Frontend
- Backend

# Test plan
## Suggestions
<!-- Provide any suggestions or recommendations for improvements in the testing plan. -->

## Underlying risk
<!-- Identify any potential risks or issues that may arise from the new feature or modification. -->

# Showcase
<!-- Including any screenshots of the new feature or modification. -->

Reviewed-on: daoyoucloud/tachycode#697
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-12 17:49:57 +08:00
hello@lv
7531ed6f74 feat: 运输单pdf付款方公司项目显示顺序调整 feat #694 (#695) 
Reviewed-on: daoyoucloud/tachycode#695
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-12 16:38:14 +08:00
hello@lv
dbdb1135bc feat: 费用范围没有考虑直发单，先简单处理掉 feat #687 (#688) 
Reviewed-on: daoyoucloud/tachycode#688
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-12 13:44:17 +08:00
wjh
d9e851d1ca fix: 合同结算单打印预览单价计算、费用赔偿计算相关，出入库内容字段报错 
Reviewed-on: daoyoucloud/tachycode#663
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-09 22:14:28 +08:00
wjh
4c8698c6ed fix: 修改结算单产品计算逻辑 (#630) 
Reviewed-on: daoyoucloud/tachycode#630
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-08 17:45:14 +08:00
lyx
e47446cc24 feat: 合同方案租金表添加修改校验 2024-04-08 15:49:52 +08:00
lyx
9cc10b88ef feat: 合同方案租金产品校验修改，长度相同进行校验 2024-04-08 12:10:51 +08:00
hello@lv
bed28c72ac feat: 更新订单分组区块，重量/金额实现方式 feat #600 (#604) 
Reviewed-on: daoyoucloud/tachycode#604
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
 2024-04-07 20:14:51 +08:00
wjh
39b3707deb fix: 修改结算单产品计算逻辑 (#619) 
Reviewed-on: daoyoucloud/tachycode#619
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-07 20:12:58 +08:00
wjh
90b1beae5e fix: 修改结算单计算逻辑 (#612) 
Reviewed-on: daoyoucloud/tachycode#612
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
 2024-04-07 16:28:10 +08:00