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
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
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
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
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
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
d3c3322fd4
refactor: clean plugin-core index
2024-03-19 12:01:14 +08:00
f4be99e802
feat: 添加自定义组件可以修改数据来源和组件，修复筛选框清空和重置后的查询问题 ( #418 )
...
<!-- 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#418
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-19 11:52:33 +08:00
e5baa89cac
chore(version): upgrade plugin-core & plugin-rental
2024-03-18 22:32:24 +08:00
lyx
0bb968d8c9
fix: path amend
2024-03-18 20:03:44 +08:00
lyx
415ef98ca6
fix: 报价总金额结算组件编辑报错修复（待重构）购销单pdf打印名称更正，pdf报价金额修复，购销列表总金额修复
2024-03-18 19:53:09 +08:00
992dde950c
Merge pull request 'feat: 合同方案区间校验' ( #405 ) from feat_contract_plain_timet_check into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#405
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-18 18:38:19 +08:00
lyx
c0c8cbab87
feat: 合同方案区间校验
2024-03-18 15:53:28 +08:00
fb91a230fb
Merge pull request 'fix: 修改自动补全重置后筛选失效问题' ( #402 ) from fix_multipleSelect into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#402
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-18 15:07:29 +08:00
5b4fbea13f
fix: 修改自动补全筛选失效问题
2024-03-18 14:13:58 +08:00
e73338815e
refactor: fields
2024-03-18 11:48:43 +08:00
240accc39e
refactor: group components
2024-03-18 11:45:23 +08:00
4ec92ea1e5
refactor: remove multiple action designer
2024-03-18 11:18:09 +08:00
85ba307506
Merge remote-tracking branch 'hera/@hera/dev' into feat_drawer_in_page
2024-03-18 11:07:10 +08:00
8d580b72b2
refactor: remove error-fallback and __builtins__ from plugin-core
2024-03-18 10:48:28 +08:00
7de2f749b1
refactor: pages import styles
2024-03-17 23:30:55 +08:00
a5145e64f7
refactor: remove page
2024-03-17 23:30:55 +08:00
2af767c7ef
refactor: migrate popover(drawer) to core/client
2024-03-17 23:30:24 +08:00
4919a372bd
fix: plugin-mobile version error
2024-03-17 17:26:57 +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
edac378ae9
Merge pull request 'feat: 汇总后端计算' ( #395 ) from feat_group_backend into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#395
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 20:29:02 +08:00
ee82c00a64
Merge pull request 'fix: 修改自动补全筛选失效问题' ( #394 ) from fix_multipleSelect into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#394
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 20:23:01 +08:00
lyx
12fcff604b
feat: 汇总后端计算
2024-03-15 20:21:33 +08:00
7f856cffb0
fix: 修改自动补全筛选失效问题
2024-03-15 20:15:46 +08:00
fd5c5cf5de
chore: upgrade plugin-audit-logs
2024-03-15 19:27:31 +08:00
99e866eae4
chore: upgrade plugin-core & plugin-rental & plugin-audit-logs
2024-03-15 19:24:34 +08:00
bf091d0247
Merge pull request 'audit_logs_i18n' ( #393 ) from audit_logs_i18n into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#393
2024-03-15 19:20:13 +08:00
e5038e2e96
fix: i18n
2024-03-15 19:19:32 +08:00
ebd35abeb0
chore: update i18n
2024-03-15 19:15:05 +08:00
759f51dae8
Merge pull request 'fix: 修改多选下拉框数据问题' ( #392 ) from fix_multipleSelect into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#392
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 19:13:40 +08:00
c544ae80f1
fix: 修改多选下拉框数据问题
2024-03-15 19:06:15 +08:00
ece1e59c9a
chore: clean codes
2024-03-15 18:58:29 +08:00
3e23aaa894
chore: clean auditlogs codes
2024-03-15 18:47:48 +08:00
30f84b7ca3
Merge pull request 'fix: audit logs loads error' ( #391 ) from fix_audit_logs into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#391
2024-03-15 18:34:33 +08:00
227e2dbf47
fix: audit logs loads error
2024-03-15 18:33:28 +08:00
3920cb20c3
fix: 通过区块的类型配置动作
2024-03-15 17:53:13 +08:00
9af29e3e5c
Merge pull request 'fix: 修改过滤自定义数据范围变量' ( #388 ) from fix_filterData into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#388
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 17:28:59 +08:00
0d9f13f596
Merge pull request 'fix: 修改自定义筛选框数据范围问题' ( #387 ) from fix_customFilter into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#387
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 17:28:49 +08:00
65a4281ad5
fix: 修改过滤自定义数据范围变量
2024-03-15 17:13:50 +08:00
a6bd972beb
fix: 修改自定义筛选框数据范围问题
2024-03-15 16:37:14 +08:00
e2a1a570e8
Merge pull request 'fix: tval import error' ( #385 ) from audit_logs into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#385
2024-03-15 16:00:47 +08:00
lyx
ecd4d560b2
fix: 合同小结计算理论重量，订单保存避免合同数据不全引发报错
2024-03-15 15:38:13 +08:00
c5a1299912
fix: tval import error
2024-03-15 15:06:19 +08:00
ccabd6a849
Merge pull request 'chore: using plugin locale' ( #383 ) from audit_logs into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#383
2024-03-15 15:03:08 +08:00
bca3a324e4
chore: using plugin locale
2024-03-15 15:02:23 +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
ac1e9abf77
chore: migrate audit logs plugin
2024-03-15 13:45:15 +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
96d35bb829
feat: 添加自定义文本筛选 ( #373 )
...
<!-- 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#373
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-14 22:25:22 +08:00
ab66403507
fix: ant design icon error in mobile
2024-03-14 22:14:11 +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
6e77717946
fix: 修改汇总区块NaN
2024-03-14 19:32:01 +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
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
lyx
bd5bcadd3a
fix: 订单pdf单位数据错误
2024-03-13 13:58:37 +08:00
58ac16a9b6
chore(version): upgrade rental
2024-03-12 23:20:21 +08:00
fa0d01fd47
fix: stack overflow
2024-03-12 23:19:36 +08:00
95452630b3
chore(version): upgrade rental
2024-03-12 21:59:56 +08:00
lyx
2245cd84e7
fix: 小结理论重量更正，报价总金额工单修改，购销单pdf工单修改，订单导入hook停用，出库入筛选基地仓库
2024-03-12 21:33:51 +08:00
1f6b802b61
chore(version): upgrade core & rental
2024-03-12 21:21:29 +08:00
02fbf868a5
Merge pull request 'feat: 小结完成，recordhook小调整' ( #350 ) from feat_record_summary into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#350
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 20:13:00 +08:00
lyx
52a17ca60c
feat: 小结完成
2024-03-12 20:07:27 +08:00
ae8d1a47b0
fix: undefined promises throw error
2024-03-12 20:03:34 +08:00
71ccf55d77
Merge pull request 'feat: 修改录单跳转问题' ( #348 ) from fix_recordNavigate into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#348
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 16:41:50 +08:00
847a1fae9a
feat: 修改录单跳转问题
2024-03-12 16:08:27 +08:00
07068febbd
feat: 添加汇总的提供请求链接地址
2024-03-12 14:29:15 +08:00
f98a4305f3
feat: add tab search block
2024-03-12 04:32:16 +08:00
f7872aa16e
feat: add notice bar and swiper block
2024-03-12 03:45:44 +08:00
92bec8c5f5
fix: after refactor path error
2024-03-11 21:17:34 +08:00
0eea4f4b96
Merge pull request 'feat: update standard interface name' ( #342 ) from feat_interface_name_standard into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#342
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-11 19:29:38 +08:00
lyx
54d0942dae
fix: eslint --fix
2024-03-11 19:25:50 +08:00
lyx
d2ad2920d1
feat: update standard interface name
2024-03-11 19:25:05 +08:00
0b6025cd65
fix: type change from any to human-made
2024-03-11 19:20:15 +08:00
cca6c649c1
chore: mock records:group api
2024-03-11 19:08:01 +08:00
649a07d581
chore: upgrade hera-core
2024-03-11 17:08:53 +08:00
e69e9b9940
fix: resource conflict with nocobase settings
2024-03-11 12:32:06 +08:00
16342247be
refactor: remove koa router deps
2024-03-11 10:38:12 +08:00
dbf6828741
fix: add oidc server plugin
2024-03-11 10:34:17 +08:00
7d35af679f
chore: update i18n
2024-03-10 05:54:34 +08:00
a0f9d54046
refactor: replace deprecated method
2024-03-10 05:48:38 +08:00
d06cce2cfa
feat: custom filter form add input component
2024-03-10 05:19:27 +08:00
c56ce13a0d
chore(version): upgrade rental
2024-03-10 04:36:36 +08:00
fbe0c14920
perf: optimize record summary
2024-03-09 02:56:27 +08:00
71c84a00de
chore(version): upgrade rental
2024-03-09 00:09:10 +08:00
47a5a504fe
perf: optimize custom components and scope
2024-03-09 00:08:19 +08:00
dbcd884526
perf: optimize valuation item
2024-03-08 23:29:42 +08:00
366312418a
chore(version): upgrade rental
2024-03-08 21:06:35 +08:00
a7bd0695ce
perf: optimize count and weight item
2024-03-08 21:05:56 +08:00
2f442f1f83
fix: record summary
2024-03-08 19:59:33 +08:00
2931eaf68b
chore(version): upgrade rental
2024-03-08 18:06:33 +08:00
928afba633
fix: record import
2024-03-08 18:02:18 +08:00
7378e30939
chore(version): upgrade rental
2024-03-08 16:43:03 +08:00
ad98ad63f1
fix: record import wrong type
2024-03-08 16:40:51 +08:00
40a30b12d8
chore(version): upgrade rental
2024-03-08 16:10:39 +08:00
253dc29c31
fix: record pdf data mistake
2024-03-08 13:47:01 +08:00
b135025d50
chore(version): upgrade rental
2024-03-08 12:17:06 +08:00
9a8987895c
fix: 修复明细没有过滤筛选条件的问题 close #327
2024-03-08 12:16:13 +08:00
33ed1e07b9
Merge pull request 'fix_record_import_typebuying_price_item' ( #326 ) from fix_record_import_typebuying_price_item into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#326
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-08 11:47:44 +08:00
c7b45440a0
feat: fix#325
2024-03-08 11:45:18 +08:00
105c657f01
chore(version): upgrade rental
2024-03-08 11:33:06 +08:00
44e550a0eb
feat: fix 购销单导入定价产品确定到规格
2024-03-08 11:16:14 +08:00
d9c8f10688
feat: fix 订单pdf费用sql去掉别名alias
2024-03-08 10:33:46 +08:00
804e253203
style: valuation item adapt to single line
2024-03-07 21:21:17 +08:00
37fa7feac0
chore: migrate to new hera
2024-03-07 20:55:41 +08:00
