Commit Graph

580 Commits

Author SHA1 Message Date
6923a17aa0 refactor: individual homepage plugin (#1003)
Reviewed-on: daoyoucloud/tachybase#1003
2024-05-17 11:17:43 +08:00
63224a033c chore(version): release v0.21.28 (#1001)
Reviewed-on: daoyoucloud/tachybase#1001
2024-05-16 19:06:28 +08:00
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
1faabf8e59 fix/approval-translate (#994)
修了个翻译错误, 顺便改了一些文件名称,从简写字母开头,改为后缀

Reviewed-on: daoyoucloud/tachybase#994
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-05-16 10:51:44 +08:00
d0bb8038ab feat: support pdf zoom in mobile (#990)
Reviewed-on: daoyoucloud/tachybase#990
2024-05-15 20:24:06 +08:00
04a6f3f09a feat: support open mode sheet (#989)
Reviewed-on: daoyoucloud/tachybase#989
2024-05-15 17:06:52 +08:00
098ff4de0c chore(version): release v0.21.27 (#988)
Reviewed-on: daoyoucloud/tachybase#988
2024-05-15 15:57:24 +08:00
f08c5b6332 fix: 修复不稳定的更新状态和错误的 preset (#985)
Reviewed-on: daoyoucloud/tachybase#985
2024-05-15 13:12:55 +08:00
b46c9ee827 feat/sancongtou-v4 (#984)
Reviewed-on: daoyoucloud/tachybase#984
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-05-15 11:45:50 +08:00
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
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
19a4d15160 fix: 修改侧边栏滑动超出后出现 (#966)
Reviewed-on: daoyoucloud/tachybase#966
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-05-10 12:31:05 +08:00
wjh
2b8604302b fix: 修复自定义标题标签不显示 (#963)
Reviewed-on: daoyoucloud/tachybase#963
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-05-10 11:49:56 +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
9e63e1c392 chore(version): release v0.21.26 (#955)
Reviewed-on: daoyoucloud/tachybase#955
2024-05-09 20:14:23 +08:00
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
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
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
wjh
87f2b6e73f fix: 修改自定义标题标签显示 (#943)
Reviewed-on: daoyoucloud/tachybase#943
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:00 +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
9f62bee481 chore: prepare release (#927)
Reviewed-on: daoyoucloud/tachybase#927
2024-05-08 19:09:43 +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
wjh
070149aa50 fix: 修改侧边菜单没有滑动效果 (#925)
Reviewed-on: daoyoucloud/tachybase#925
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-05-08 19:04:38 +08:00
wjh
ffc9236728 fix: 修改汇总区块兼容视图没有字段的情况 (#923)
Reviewed-on: daoyoucloud/tachybase#923
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-05-08 17:50:26 +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
wjh
d64d092dbd feat: 合并 @hera/plugin-mobile 到 @tachybase/plugin-mobile-client close #906 (#912)
Reviewed-on: daoyoucloud/tachybase#912
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-05-06 18:50:49 +08:00
4bb491f2e3 feat: 三聪头相关移动端支持逻辑 (#798)
Co-authored-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#798
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-05-06 12:41:25 +08:00
46129499be feat: support workflow bulk (#858)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#858
2024-04-30 16:27:50 +08:00
8a789c70f1 chore: migrate components (#893)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#893
2024-04-30 02:00:13 +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
d3a1a8c98e fix: plugin-core, CalcResult, fix childrenType (#888)
Reviewed-on: daoyoucloud/tachybase#888
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-29 13:24:38 +08:00
f3bd122b57 refactor: optimize context menu and clean @hera/plugin-core (#886)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#886
2024-04-29 01:48:06 +08:00
cfa2bc9775 chore: optimize context menu behaviour (#885)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#885
2024-04-29 01:17:14 +08:00
51335834c8 feat: plugin-core, extends calcResult support jsx dayjs (#882)
Reviewed-on: daoyoucloud/tachybase#882
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-28 20:39:17 +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
748cfc56bc fix: plugin-approval, trigger data (#861)
Reviewed-on: daoyoucloud/tachybase#861
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-26 15:41:54 +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
1816660c14 feat: support context menu and draggable button (#844)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#844
2024-04-25 16:27:03 +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
c82fe54fe4 feat: support date range field (#828)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#828
2024-04-24 20:56:07 +08:00
a5f865c112 chore(version): release v0.21.22 (#841)
Reviewed-on: daoyoucloud/tachybase#841
2024-04-24 18:57:53 +08:00
021c8a9a16 fix: plugin-approval, submit approval or reject faild (#835)
Reviewed-on: daoyoucloud/tachybase#835
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-24 16:05:44 +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
e9c4ade676 feat: improve approval (#820)
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Reviewed-on: daoyoucloud/tachybase#820
2024-04-24 11:58:14 +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
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
1b59cb2a6b feat: 工作流审批组件完善 (#673)
Co-authored-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#673
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-23 20:51:33 +08:00
090db400a4 refactor: migrate assistant/page-style/hera-version (#817)
Reviewed-on: daoyoucloud/tachybase#817
2024-04-23 20:30:12 +08:00
5b8bd6e19c fix: setting block cant search items (#814)
Reviewed-on: daoyoucloud/tachybase#814
2024-04-23 17:54:31 +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
a7f59c73a7 fix: fix bug, AutoComplete, add fault tolerant (#806)
Reviewed-on: daoyoucloud/tachybase#806
2024-04-23 11:59:44 +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
ca604e83b7 chore: add translations for embed page (#789)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#789
2024-04-21 22:09:10 +08:00
c949bf4141 feat: init support departments (#788)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#788
2024-04-21 06:35:02 +08:00
4bc1eb5ac2 feat: support embed page (#786)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#786
2024-04-21 03:57:48 +08:00
cd9c2e1e8c feat: init external data source support (#785)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#785
2024-04-20 17:41:23 +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
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
307ff38c8d chore(version): release @hera/plugin-rental 2024-04-19 08:35:33 +08:00
wjh
78f75f8254 feat: 新增mobile审批组件样式模版 close #742 (#763)
Reviewed-on: daoyoucloud/tachybase#763
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-19 05:05:32 +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
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
bc167dca1c fix: createAt field error 2024-04-18 03:07:56 +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
8da9c47a7e feat: 支持设置显示附件数量 (#753)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#753
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-18 00:03:32 +08:00
lyx
25418ffbde chore: version 2024-04-16 21:48:28 +08:00
wjh
9d1d490f6e fix: 优化筛选组件文本情况时加2s延迟,轮播图没有数据时添加提示 close #735 (#738)
Reviewed-on: daoyoucloud/tachycode#738
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-16 21:02:13 +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
wjh
e0be6a7aba fix: 修复自定义组件下拉框没有自定义显示选项 (#730)
Reviewed-on: daoyoucloud/tachycode#730
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-16 15:53:13 +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
lyx
5e215fae7e chore: mobild 2024-04-16 11:07:44 +08:00
wjh
a08b45b498 fix: 修复mobile选择类型不能用的情况 fix #723
Reviewed-on: daoyoucloud/tachycode#725
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-16 11:02:33 +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
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
wjh
2020643371 fix: 处理同名组件选择异常情况,文本切换组件阈值,时间选择具体范围 (#712)
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-15 17:40:22 +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
14e282964d chore: 移除多余插件 (#708)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#708
2024-04-15 05:35:49 +08:00
9116a74823 chore(version): release v0.21.7 2024-04-15 05:32:07 +08:00
wjh
a1223960e2 feat: 移动端筛选区块二期:支持更多类型 (#702)
Reviewed-on: daoyoucloud/tachycode#702
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-12 22:03:56 +08:00
bb204b8f95 chore(version): release @hera 2024-04-12 17:54:18 +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
wjh
da8b4d0b45 fix: 修改筛选页面自定义筛选不能用 (#698) fix #699
Reviewed-on: daoyoucloud/tachycode#698
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-12 17:49:11 +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
47671bb428 chore(version): release @hera 2024-04-12 15:11:31 +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
65693d0359 feat: 支持轮播图设置和跳转
Reviewed-on: daoyoucloud/tachycode#691
2024-04-12 15:04:09 +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
bai.jingfeng
946b77e9df 配置插件名称: 移动端:定制化,工作流:审批中心 (#678)
Reviewed-on: daoyoucloud/tachycode#678
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-11 11:50:42 +08:00
wjh
f0a0505695 fix: 修复组件移动别的区块后出错 修复单选框点击出错 (#680)
Reviewed-on: daoyoucloud/tachycode#680
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-11 11:50:00 +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
wjh
35cddcc80c fix: 调整mobile类型选择组件 (#670)
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-10 17:19:31 +08:00
35310f7532 fix: mobile icon build error 2024-04-10 17:08:40 +08:00
6351c1c44f chore(version): release v0.21.4
Reviewed-on: daoyoucloud/tachycode#668
2024-04-10 16:14:26 +08:00
438169cd71 feat: 初步支持审批流程
Reviewed-on: daoyoucloud/tachycode#664
2024-04-10 16:00:42 +08:00
8a2548f480 feat: 移动端支持筛选
Reviewed-on: daoyoucloud/tachycode#638
2024-04-10 15:54:01 +08:00
bai.jingfeng
a5010cd74c feat: 显示界面支持货币取反 (#666)
Reviewed-on: daoyoucloud/tachycode#666
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-10 15:32:19 +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
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
96d06b5919 chore(version): plugin-rental 2024-04-08 22:13:05 +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
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
cdb6247a99 Merge pull request 'feat: 更新提交数据,支持增量提交' (#622) from feat/submit-edit-field-only into dev
Reviewed-on: daoyoucloud/tachycode#622
2024-04-08 12:14:59 +08:00
lyx
9cc10b88ef feat: 合同方案租金产品校验修改,长度相同进行校验 2024-04-08 12:10:51 +08:00
bai.jingfeng
64387242a6 feat: 更新提交数据,支持增量提交 2024-04-07 21:05: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
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
9331bf3c6d Merge pull request 'fix: 修改汇总区块不格式化文本类型' (#605) from fix-group into dev
Reviewed-on: daoyoucloud/tachycode#605
2024-04-07 13:28:35 +08:00
wjh
58c9dc0dba fix: 修复更新antd后的导航图标样式异常 2024-04-07 11:42:25 +08:00
wjh
a4ab6ff994 fix: 修改汇总区块不格式化文本类型 2024-04-07 10:34:32 +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
lyx
91e734b094 fix: 消息通知点击已读,提示消息为清空 fix #467 2024-04-02 15:02:15 +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
wjh
bc9ac59ac2 fix: 将过滤按钮的过滤条件放到三级 (#550)
Reviewed-on: daoyoucloud/tachycode#550
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-01 11:48:22 +08:00
98e18a1a3a fix: deps 2024-03-30 06:25:52 +08:00
a5c5df6864 perf: using evaluator to reduce package size 2024-03-30 06:07:51 +08:00
f06518a05c refactor: move menu load and dump function to core/client 2024-03-30 05:28:26 +08:00
7d508d0fc4 feat: remove copied date-picker component, add schema-settings date presets 2024-03-30 05:04:08 +08:00
d675e2815c feat: support date picker modification 2024-03-30 04:07:16 +08:00
53bb505823 refactor: adjusting group block loading methods and folder structure 2024-03-30 03:36:29 +08:00
47e5892c61 fix: group block error 2024-03-30 02:46:48 +08:00
wjh
48b045c4f9 fix: 修改下拉框组件字段默认值 (#539)
Reviewed-on: daoyoucloud/tachycode#539
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-30 02:22:56 +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
5d6a6e6450 feat: add websocket block 2024-03-29 17:09:07 +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
wjh
08adf2fe40 fix: 图表添加级联选择 (#522)
<!-- 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#522
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:47:41 +08:00
4a25d973c0 fix: setting block filter order error 2024-03-27 20:07:17 +08:00
wjh
9b405b4b9d fix: 把remoteSelect和Select组件合并到框架 (#499)
Reviewed-on: daoyoucloud/tachycode#499
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-27 16:49:56 +08:00
bai.jingfeng
0eeb44c306 fix: 修复ErrorBoundary,使用react-error-boundary (#510)
<!-- 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#510
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-27 14:36:26 +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
bai.jingfeng
6251551ded fix: 修复errorBoundary (#504)
<!-- 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#504
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-26 21:50:03 +08:00
bai.jingfeng
f2ad0534fa feat: 增加自定义组件ErrorBoundary, 以及给现有的三个自定义组件,进行错误边界处理 (#501) fix #497
Reviewed-on: daoyoucloud/tachycode#501
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-26 20:07:25 +08:00
bai.jingfeng
4a295a216f feat:自定义筛选组件,优化用户输入跟踪,在筛选项顶部添加一个用户的原始输入 (#491)
Reviewed-on: daoyoucloud/tachycode#491
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-25 21:34:08 +08:00
wjh
f3782baebd fix: 修改数据表设置权限时小结出不来的问题 2024-03-25 21:32:18 +08:00
cba46cc29c fix: association cascader can not filter 2024-03-25 20:40:08 +08:00
80a53806bd fix: association-cascader should use fieldnames 2024-03-25 18:25:55 +08:00
c5e0301e3d chore: upgrade plugin-rental 2024-03-25 18:01:57 +08:00
wjh
9f23211ccd fix: 优化汇总组件的金额符号根据系统语言变化 (#488)
Reviewed-on: daoyoucloud/tachycode#488
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-25 17:58:08 +08:00
78e1aeb4f2 chore: upgrade plugin-core & plugin-rental 2024-03-25 17:57:11 +08:00
629b334422 Merge pull request 'refactor: remove x-compoent-custom' (#490) from fix_name_error into @hera/dev
Reviewed-on: daoyoucloud/tachycode#490
2024-03-25 17:56:15 +08:00
301ae1e83a refactor: remove x-compoent-custom 2024-03-25 17:49:52 +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
1ddd858536 refactor: rename filter-form 2024-03-22 04:34:29 +08:00
930e077e68 refactor: reorganize files and fix association field config visible problem 2024-03-22 03:38:19 +08:00
25e41e479e refactor: try reduce 2024-03-22 03:15:43 +08:00
e8497f8f8e feat: association cascader support filter 2024-03-22 02:54:13 +08:00
436088d7b9 feat: support association-cascader filter form item 2024-03-22 02:36:54 +08:00
5489c9e569 chore(version): upgrade plugin-rental 2024-03-21 23:43:50 +08:00
e07ee53db7 refactor: remove after success 2024-03-21 22:04:48 +08:00
eddb3230c6 refactor: remove unused codes 2024-03-21 21:44:44 +08:00
wjh
2620acbba7 feat: 添加组件默认值 (#461)
Reviewed-on: daoyoucloud/tachycode#461
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-21 20:48:45 +08:00
68025facb4 refactor: remove unused codes, move blocks to /schema-initializer/blocks 2024-03-21 20:38:26 +08:00
59d2af69c3 chore: migrate to new dump rule 2024-03-21 19:50:45 +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
18e929a275 fix: excel scroll bugs 2024-03-21 16:08:32 +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
5df5fb5be6 feat: 移植 x-spreadsheet (#437)
Reviewed-on: daoyoucloud/tachycode#437
2024-03-20 12:29:24 +08:00
wjh
db104c20ce feat: 添加自定义组件下拉框类型 (#436)
Reviewed-on: daoyoucloud/tachycode#436
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-20 12:02:41 +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
486b51f2aa Merge pull request 'feat: 添加自定义组件文本类型' (#432) from fix_filterCustom into @hera/dev
Reviewed-on: daoyoucloud/tachycode#432
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-19 18:58:56 +08:00
wjh
c0fde83b33 feat: 添加自定义组件文本类型 2024-03-19 18:30:05 +08:00
lyx
82e1355c39 feat: 新版发票视图 2024-03-19 17:22:10 +08:00
629eb576f1 Merge pull request 'fix: 修改自定义筛选为字段内容本身' (#425) from fix_filterCuston into @hera/dev
Reviewed-on: daoyoucloud/tachycode#425
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-19 15:41:23 +08:00
wjh
2b1871526c fix: 修改自定义筛选为字段内容本身 2024-03-19 15:30:06 +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