diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js index d820c71a..859d9289 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js @@ -18,7 +18,7 @@ export default {
-
{{item.title}}
+
{{item.title}}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/bei-jian.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/bei-jian.js index aa02e8a0..1dbaf4c1 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/bei-jian.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/bei-jian.js @@ -12,11 +12,15 @@ const schema = { }, beginDate: { title: "开始时间", - type: "DateTime", + type: "string", + input: "datetime", + clearable: true, }, endDate: { title: "结束时间", - type: "DateTime", + type: "string", + input: "datetime", + clearable: true, }, clientCode: { title: "客户编码", @@ -72,6 +76,20 @@ export default function () { }, }, default: [ + { + logic: "and", + column: "beginDate", + action: "biggerThanOrEqual", + value: null, + readOnly: true, + }, + { + logic: "and", + column: "endDate", + action: "smallThanOrEqual", + value: null, + readOnly: true, + }, { logic: "and", column: "lu", @@ -79,6 +97,13 @@ export default function () { value: null, readOnly: true, }, + { + logic: "and", + column: "contractNo", + action: "like", + value: null, + readOnly: true, + }, ], }, skipCount: { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js index 11ee5aee..d6d9ba8b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js @@ -374,10 +374,12 @@ export default { qty: { type: "number", title: "数量", + reduce: (x, y) => x + y, }, amt: { type: "number", title: "金额", + reduce: (x, y) => x + y, }, }, };