diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js index 056ff6b5..7bc73254 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js @@ -7,7 +7,7 @@ const defaultCompareSchema = { properties: { version: Object.assign(version2, { rules: [{ required: true }] }), seDateTime: { - title: "发运日期", + title: "发运结束日期", type: "string", input: "datetime", rules: [ @@ -18,8 +18,8 @@ const defaultCompareSchema = { }, downLineDateTime: { title: "下线日期", - type: "string", - input: "datetime", + type: "array", + input: "datetimerange", }, pn: { title: "通用码", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/compare/_compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/compare/_compare.js index 117e6928..fa4acdab 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/compare/_compare.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/compare/_compare.js @@ -53,9 +53,12 @@ export default function (type) { const url = config.edit.compareUrl; const data = Object.assign({ businessType, name: config.name }, model.value); if (data.seDateTime?.length === 2) { - data.seStartDateTime = data.seDateTime[0]; + data.seStartDateTime = data.seDateTime[1]; data.seEndDateTime = data.seDateTime[1]; } + else { + data.seEndDateTime = data.seDateTime; + } if (data.downLineDateTime?.length === 2) { data.downLineStartDateTime = data.downLineDateTime[0]; data.downLineEndDateTime = data.downLineDateTime[1];