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
3bf232d952
fix: view contract ( #949 )
...
Reviewed-on: daoyoucloud/tachybase#949
2024-05-09 15:34:40 +08:00
882a1a95a5
feat: support view contracts ( #947 )
...
Reviewed-on: daoyoucloud/tachybase#947
2024-05-09 14:15:47 +08:00
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
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
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
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
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
1225588938
chore(version): release v0.21.25 ( #931 )
...
Reviewed-on: daoyoucloud/tachybase#931
2024-05-08 20:39:31 +08:00
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
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
a6c26367b3
chore(version): upgrade plugin-rental ( #913 )
...
Reviewed-on: daoyoucloud/tachybase#913
2024-05-06 19:06:23 +08:00
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
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
486a08d75e
feat: support-business-fields ( #879 )
...
Reviewed-on: daoyoucloud/tachybase#879
2024-04-28 17:38:07 +08:00
174f1464fa
feat: support business fields ( #877 )
...
Reviewed-on: daoyoucloud/tachybase#877
2024-04-28 17:30:39 +08:00
022c315523
chore(version): release v0.21.24 ( #864 )
...
Reviewed-on: daoyoucloud/tachybase#864
2024-04-26 15:44:15 +08:00
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
e84fb947db
chore(version): release v0.21.23 ( #855 )
...
Reviewed-on: daoyoucloud/tachybase#855
2024-04-25 19:06:10 +08:00
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
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
a5f865c112
chore(version): release v0.21.22 ( #841 )
...
Reviewed-on: daoyoucloud/tachybase#841
2024-04-24 18:57:53 +08:00
cc58ee4acc
chore(version): release @hera/plugin-rental ( #836 )
...
Reviewed-on: daoyoucloud/tachybase#836
2024-04-24 14:53:07 +08:00
ff3496ea79
chore(version): release v0.21.21 ( #830 )
...
Reviewed-on: daoyoucloud/tachybase#830
2024-04-24 13:11:55 +08:00
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
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
39447504ec
chore(version): release @hera/plugin-rental ( #826 )
...
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#826
2024-04-24 03:09:52 +08:00
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
737360bbcb
chore(version): release @hera/plugin-core and @hera/plugin-rental ( #824 )
...
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#824
2024-04-24 02:48:07 +08:00
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
72bb3b43fe
chore(version): release v0.21.20 ( #819 )
...
Reviewed-on: daoyoucloud/tachybase#819
2024-04-23 20:55:26 +08:00
13fa2ffea3
chore: version 20240423 组件补全组件报错 ( #807 )
...
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#807
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-23 12:21:14 +08:00
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
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
99b79d87ad
chore(version): release v0.21.18 ( #784 )
...
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#784
2024-04-20 07:02:22 +08:00
7371495cda
chore(version): release version v0.21.17 ( #778 )
...
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#778
2024-04-20 04:35:49 +08:00
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
307ff38c8d
chore(version): release @hera/plugin-rental
2024-04-19 08:35:33 +08:00
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
lyx
29ec447fee
chore: version
2024-04-18 15:46:56 +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
78ba43e7f9
chore(version): upgrade @hera/plugin-rental
2024-04-18 14:48:01 +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
b4aa7ddea7
chore(version): release v0.21.16
2024-04-18 03:09:15 +08:00
a5bf64eb93
chore(version): release v0.21.15
2024-04-18 01:33:03 +08:00
c53dedd2b2
chore(version): release v0.21.14
2024-04-18 00:10:10 +08:00
lyx
25418ffbde
chore: version
2024-04-16 21:48:28 +08:00
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
lyx
a20a4df543
chore: rental
2024-04-16 15:03:25 +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
520b0024d4
chore(version): release v0.21.12
2024-04-16 04:44:41 +08:00
2733e513d2
chore(release): release v0.21.11
2024-04-16 04:35:58 +08:00
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
9116a74823
chore(version): release v0.21.7
2024-04-15 05:32:07 +08:00
bb204b8f95
chore(version): release @hera
2024-04-12 17:54:18 +08:00
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
7e87eca642
chore(version): release @hera
2024-04-12 15:09:52 +08:00
3c1b198920
chore(version): release @hera
2024-04-12 15:08:25 +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
b253ffafb6
chore(version): release v0.21.6
2024-04-11 00:06:27 +08:00
d2ba989f56
chore(version): release v0.21.5
2024-04-10 22:20:34 +08:00
6351c1c44f
chore(version): release v0.21.4
...
Reviewed-on: daoyoucloud/tachycode#668
2024-04-10 16:14:26 +08:00
33a0b34c07
chore(version): release v0.21.3
2024-04-10 01:28:26 +08:00
311e74e3f7
chore(version): release new version
2024-04-10 01:26:07 +08:00
fe69e14aa6
chore(version): release 0.21.2-alpha.13
2024-04-10 01:07:15 +08:00
464a963316
chore(version): release 0.21.2-alpha.12
2024-04-10 00:37:35 +08:00
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
96d06b5919
chore(version): plugin-rental
2024-04-08 22:13:05 +08:00
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
0add483693
chore(version): fix sort
2024-04-08 15:58:36 +08:00
lyx
e47446cc24
feat: 合同方案租金表添加修改校验
2024-04-08 15:49:52 +08:00
ab66334682
chore: upgrade version
2024-04-08 14:01:17 +08:00
lyx
9cc10b88ef
feat: 合同方案租金产品校验修改,长度相同进行校验
2024-04-08 12:10:51 +08:00
c8917cec52
chore: release new version
2024-04-07 20:20:24 +08:00
97aae004c4
chore: upgrade version
2024-04-07 20:18:01 +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
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
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
5db6f51e70
chore: upgrade version
2024-04-06 03:36:20 +08:00
732a2673a0
chore: upgrade version
2024-04-03 19:40:05 +08:00
93b7abbd30
fix: 修复多标签页标题问题
...
Reviewed-on: daoyoucloud/tachycode#594
2024-04-03 18:00:51 +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
ec4779a94d
chore: upgrade version
2024-04-03 00:24:39 +08:00
67d6b2d5f4
chore: upgrade version
2024-04-02 20:38:48 +08:00
f70de8501b
chore: upgrade version
2024-04-02 19:17:40 +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
3d7af7734c
feat: 支持 docker 构建
...
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#561
2024-04-01 17:29:46 +08:00
d1b50a8f31
feat: 将 yarn + learn 的 monorepo 转成 pnpm ( #548 ) ( #555 )
...
Reviewed-on: daoyoucloud/tachycode#555
2024-04-01 13:39:44 +08:00
98e18a1a3a
fix: deps
2024-03-30 06:25:52 +08:00
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
6d85d2f826
chore(versions): publish @hera/plugin-rental v1.7.2
2024-03-29 16:31:23 +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