|
|
|
@ -137,12 +137,12 @@ export default { |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
display: false, |
|
|
|
display: false, |
|
|
|
span: 12, |
|
|
|
span: 12, |
|
|
|
type: 'datetime', |
|
|
|
type: 'date', |
|
|
|
searchRange: true, |
|
|
|
searchRange: true, |
|
|
|
startPlaceholder: '开始时间', |
|
|
|
startPlaceholder: '开始时间', |
|
|
|
endPlaceholder: '结束时间', |
|
|
|
endPlaceholder: '结束时间', |
|
|
|
format: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
format: 'YYYY-MM-DD', |
|
|
|
valueFormat: 'YYYY-MM-DD HH:mm:ss', |
|
|
|
valueFormat: 'YYYY-MM-DD', |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
@ -393,7 +393,12 @@ export default { |
|
|
|
const requestParams = Object.assign({}, params, this.query); |
|
|
|
const requestParams = Object.assign({}, params, this.query); |
|
|
|
// 后端要字符串类型 |
|
|
|
// 后端要字符串类型 |
|
|
|
if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) { |
|
|
|
if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) { |
|
|
|
requestParams.queryDosingTime = requestParams.queryDosingTime.join(','); |
|
|
|
// 处理开始时间 |
|
|
|
|
|
|
|
const start = requestParams.queryDosingTime[0] + ' 00:00:00'; |
|
|
|
|
|
|
|
// 处理结束时间 |
|
|
|
|
|
|
|
const end = requestParams.queryDosingTime[1] + ' 23:59:59'; |
|
|
|
|
|
|
|
// 合并开始时间和结束时间 |
|
|
|
|
|
|
|
requestParams.queryDosingTime = [start, end].join(','); |
|
|
|
} |
|
|
|
} |
|
|
|
getList(page.currentPage, page.pageSize, requestParams) |
|
|
|
getList(page.currentPage, page.pageSize, requestParams) |
|
|
|
.then(res => { |
|
|
|
.then(res => { |
|
|
|
|