Commit Graph

112 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
0a98e7e8f2 fix_record_price_pdf (#592)
Reviewed-on: daoyoucloud/tachycode#592
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-03 17:56:41 +08:00
ff9ae1a2f5 fix_record_price_pdf (#587)
Reviewed-on: daoyoucloud/tachycode#587
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-03 13:03:56 +08:00
dbb1703dff feat: @formily/* 统一成 @nocobase/schema,清理所有的 ts build 报错 (#566)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#566
2024-04-02 18:13:33 +08:00
bai.jingfeng
dd38283c91 fix: 财务-明细查询,本公司,添加设置数据范围, 同步官方 (#565)
Reviewed-on: daoyoucloud/tachycode#565
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-02 11:46:45 +08:00
wjh
1675b39d0e feat: 汇总区块添加表格样式及配置项排序 (#536)
Reviewed-on: daoyoucloud/tachycode#536
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-30 02:22:44 +08:00
1eda5609b7 feat: add inventory order 2024-03-29 16:31:39 +08:00
bai.jingfeng
c2604631a8 feat: 增值税计算,sql,添加状态筛选的功能 2024-03-29 16:05:42 +08:00
38fdd9c332 fix_invoices_view (#533)
Reviewed-on: daoyoucloud/tachycode#533
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-29 11:37:57 +08:00
bai.jingfeng
ce2282e673 feat: sql,增值税计算,添加注释以及开启开头注释掉的有用代码 2024-03-29 10:38:47 +08:00
bai.jingfeng
d735513479 feat: 增值税计算,sql构建完成 (#527)
Reviewed-on: daoyoucloud/tachycode#527
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-29 02:15:05 +08:00
fb1af9a34a Merge pull request 'fix: 修改小结组件不显示赔偿' (#509) from fix_recordSummary into @hera/dev
Reviewed-on: daoyoucloud/tachycode#509
2024-03-28 17:10:39 +08:00
wjh
75b3148521 fix: 结算单报错 (#515)
<!-- 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#515
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:49:36 +08:00
lyx
108ff55ad3 feat: 发票项目新增项目关连字段 fix #507 2024-03-27 14:10:38 +08:00
wjh
629fff170f fix: 修改小结组件不显示赔偿 2024-03-27 13:12:52 +08:00
wjh
7dfb308503 fix: 修改计价数量报错 (#505)
<!-- 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#505
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-27 11:11:14 +08:00
eb090572c6 feat: 仓库二期,出入库单打印预览,产品范围,计价数量,换算数量
Reviewed-on: daoyoucloud/tachycode#503
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-26 23:09:59 +08:00
lyx
91f273660d fix: 产品赔偿费用无计算结果 fix #481 2024-03-25 17:39:48 +08:00
wjh
aa2542b706 fix: 优化自定义筛选组件和逻辑 (#486)
<!-- 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. -->

Co-authored-by: sealday <sealday@gmail.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Reviewed-on: daoyoucloud/tachycode#486
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-25 17:24:21 +08:00
wjh
610fee7035 fix: 修改合同编号为合同编码 (#483)
Reviewed-on: daoyoucloud/tachycode#483
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-25 17:21:22 +08:00
2ddbe8e596 fix: pdf双列备注信息展示重复 (#471) fix #472
Reviewed-on: daoyoucloud/tachycode#471
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-23 22:29:03 +08:00
lyx
8368ca0f62 feat: 恢复不必要的判断写法,valuse不可能为空,不必要打问号 2024-03-22 11:24:27 +08:00
lyx
697cd62e7c fix: create error because waybill 2024-03-22 10:50:08 +08:00
lyx
92bc2bfe53 fix: 直发单中录运输单报错 fix #455 2024-03-21 19:06:36 +08:00
lyx
dae8445d5f fix: 直发单运输单录入失败 2024-03-21 19:00:15 +08:00
6f61b08f81 feat_view_invoices_sql (#454)
Reviewed-on: daoyoucloud/tachycode#454
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-21 17:44:55 +08:00
e307b11006 fix_record_fee_print (#443)
Reviewed-on: daoyoucloud/tachycode#443
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-20 19:20:26 +08:00
70d8b2cfef feat: support unused number 2024-03-20 18:57:38 +08:00
23e387caf2 feat: support api 2024-03-20 18:48:42 +08:00
bc2544ed34 feat: add unused records block 2024-03-20 18:23:30 +08:00