Commit Graph

187 Commits

Author SHA1 Message Date
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
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
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
74a0d754f5 chore(versions): publish @hera/plugin-rental v1.7.1 2024-03-29 02:17:05 +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
86fee92f72 fix: build error 2024-03-29 01:47:57 +08:00
09aae19848 chore(version): upgrade plugin-core & plugin-rental 2024-03-29 01:40:15 +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
5900971df2 feat: rental updata version 1.6.5 2024-03-27 14:27:14 +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
lyx
ca3c0f4d91 feat: update rental version 2024-03-27 11:15:17 +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
c5e0301e3d chore: upgrade plugin-rental 2024-03-25 18:01:57 +08:00
78e1aeb4f2 chore: upgrade plugin-core & plugin-rental 2024-03-25 17:57:11 +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
44259e8260 feat: rental upversions 2024-03-22 10:54:59 +08:00
lyx
697cd62e7c fix: create error because waybill 2024-03-22 10:50:08 +08:00
5489c9e569 chore(version): upgrade plugin-rental 2024-03-21 23:43:50 +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
6dab16e437 chore(version): upgrade plugin-rental 2024-03-20 23:24:35 +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
7813ace40c chore(version): upgrade plugin-rental 2024-03-20 16:43:38 +08:00
fa5135ce33 Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into @hera/dev 2024-03-20 16:42:51 +08:00
65f62675d3 fix_record_fee_print (#440)
Reviewed-on: daoyoucloud/tachycode#440
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 16:41:20 +08:00
fc1b890937 chore(version): upgrade plugin-core & plugin-rental 2024-03-20 15:20:09 +08:00
lyx
b9c31eade2 fix: 订单费用pdf部分失效 2024-03-20 14:31:26 +08:00
lyx
0c60f426e3 feat: 合同方案租金/费用项,基础表的校验 2024-03-19 20:50:54 +08:00
23fe420cf0 feat: record group weight and allprice (#431)
Reviewed-on: daoyoucloud/tachycode#431
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-19 19:06:47 +08:00
lyx
82e1355c39 feat: 新版发票视图 2024-03-19 17:22:10 +08:00
lyx
cd69f62768 feat: 车牌号校验 2024-03-19 15:08:18 +08:00
lyx
200a58f370 feat: 车牌号带有’挂‘字样处理 2024-03-19 14:43:42 +08:00
lyx
4bd98be813 Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into feat_record_check_vehicles 2024-03-19 13:25:52 +08:00
lyx
d8a24dce40 feat: 订单车牌号校验 2024-03-19 13:20:51 +08:00
1d8a97bdc0 Merge pull request 'fix: add schema item max stack exceeded' (#422) from fix_max_stack into @hera/dev
Reviewed-on: daoyoucloud/tachycode#422
2024-03-19 13:11:39 +08:00
a44c582b1d fix: add schema item max stack exceeded 2024-03-19 13:09:14 +08:00
wjh
60a37c58c4 fix: 修改订单查询显示的理论重量逻辑 (#420)
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-19 12:02:10 +08:00
e5baa89cac chore(version): upgrade plugin-core & plugin-rental 2024-03-18 22:32:24 +08:00
lyx
415ef98ca6 fix: 报价总金额结算组件编辑报错修复(待重构)购销单pdf打印名称更正,pdf报价金额修复,购销列表总金额修复 2024-03-18 19:53:09 +08:00
lyx
c0c8cbab87 feat: 合同方案区间校验 2024-03-18 15:53:28 +08:00
cd62e83403 add mobile plugin and other refactors (#396)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#396
2024-03-17 04:20:33 +08:00
24471c7fbe chore: upgrade plugin-rental 2024-03-16 00:51:12 +08:00
25e170aada fix: delete logic error 2024-03-16 00:48:07 +08:00
b8b9e844cd chore: upgrade plugin-core & plugin-rental 2024-03-15 20:45:16 +08:00
4b212084f8 fix: post data error 2024-03-15 20:40:05 +08:00
lyx
12fcff604b feat: 汇总后端计算 2024-03-15 20:21:33 +08:00
99e866eae4 chore: upgrade plugin-core & plugin-rental & plugin-audit-logs 2024-03-15 19:24:34 +08:00
wjh
3920cb20c3 fix: 通过区块的类型配置动作 2024-03-15 17:53:13 +08:00
lyx
ecd4d560b2 fix: 合同小结计算理论重量,订单保存避免合同数据不全引发报错 2024-03-15 15:38:13 +08:00
8f1b7693a8 Merge pull request 'fix_record_direct_problem' (#382) from fix_record_direct_problem into @hera/dev
Reviewed-on: daoyoucloud/tachycode#382
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 13:54:00 +08:00
lyx
9a44893c83 fix: 其他订单报错问题 2024-03-15 13:39:40 +08:00
lyx
74bc59a62b fix: 无车辆信息时报错 2024-03-15 13:29:04 +08:00
83f01305cb chore(veresion): upgrade plugin-rental 2024-03-15 12:36:03 +08:00
lyx
a64f3b9e46 feat: 关闭失误打开的注释 2024-03-15 12:30:16 +08:00
lyx
22391c10c2 fix: record direct problem 2024-03-15 12:28:32 +08:00
77901e4f3e chore(version): upgrade core & rental 2024-03-14 22:31:36 +08:00
cc09966d63 feat: support add collection to collectionManager 2024-03-14 22:14:11 +08:00
8ccfdf5828 chore(version): upgrade rental 2024-03-14 22:14:11 +08:00
lyx
b35dbec2fd feat: schemaInitializerManager 2024-03-14 16:55:27 +08:00
lyx
e347a0d17b fix: 工单完成 fix #371 fix #370 2024-03-14 16:35:59 +08:00
lyx
fe268d5f15 fix: 订单pdf报价实际重量/小结报价实际重量/运输单上边距 2024-03-14 16:32:52 +08:00
lyx
1d14cd82e8 fix: 新建自动结算合同,多创建数据 2024-03-14 11:32:33 +08:00
83deef45d0 Merge pull request 'feat: 订单打印上边距可调整' (#367) from feat_recordpdf_top_margin into @hera/dev
Reviewed-on: daoyoucloud/tachycode#367
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-14 10:33:29 +08:00
lyx
2125c8ddae feat: 更新数据参数规范 2024-03-14 10:32:18 +08:00
lyx
eb476a95e2 feat: 订单打印上边距可调整 2024-03-13 21:29:43 +08:00
048b7776b0 chore(version): upgrade core & rental 2024-03-13 20:22:48 +08:00
lyx
e14f99341a fix: 编辑直发单,对应生成单单号保持不变 2024-03-13 18:53:44 +08:00
5a7c78d791 chore(version): upgrade core & rental 2024-03-13 15:29:08 +08:00
7a77536fc1 Merge pull request 'fix: 修改汇总区块NaN,添加自定义组件的理论重量' (#363) from fix_group into @hera/dev
Reviewed-on: daoyoucloud/tachycode#363
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-13 15:26:32 +08:00
12fe07e197 update (#362)
<!-- 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>
Reviewed-on: daoyoucloud/tachycode#362
2024-03-13 15:11:31 +08:00
5e2d8e871f Merge pull request 'chore(version): upgrade core & rental' (#361) from update into @hera/dev
Reviewed-on: daoyoucloud/tachycode#361
2024-03-13 15:09:45 +08:00
wjh
5ad280a8b3 fix: 修改汇总区块NaN,添加自定义组件的理论重量 2024-03-13 15:07:24 +08:00
lyx
2099be026a feat: recodpdf kg不换算吨 2024-03-13 14:29:21 +08:00
65f3f838c6 chore(version): upgrade core & rental 2024-03-13 14:01:13 +08:00