|
|
|
@ -51,15 +51,14 @@ |
|
|
|
<!-- 时间 --> |
|
|
|
<el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" :start-placeholder="t('ts.开始时间')" :end-placeholder="t('ts.结束时间')" v-model="item.value1" style="width: calc(100% - 20px);margin-right: 10px;" :disabled="item.disabled" /> |
|
|
|
<!-- 日期 --> |
|
|
|
<el-date-picker v-else-if="getInputType(item.column) == 'date'" v-model="item.value1" type="daterange" |
|
|
|
range-separator="-" :start-placeholder="t('ts.开始日期')" :end-placeholder="t('ts.结束日期')" style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD" format="YYYY/MM/DD" :disabled="item.disabled"/> |
|
|
|
<el-date-picker v-else-if="getInputType(item.column) == 'date'" v-model="item.value1" type="daterange" range-separator="-" :start-placeholder="t('ts.开始日期')" :end-placeholder="t('ts.结束日期')" style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD" format="YYYY/MM/DD" :disabled="item.disabled" /> |
|
|
|
<!-- 日期时间 --> |
|
|
|
<el-date-picker v-else-if="getInputType(item.column) == 'datePicker'" v-model="item.value1" type="datetimerange" |
|
|
|
range-separator="-" :start-placeholder="t('ts.开始时间')" :end-placeholder="t('ts.结束时间')" style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x" format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/> |
|
|
|
<el-date-picker v-else-if="getInputType(item.column) == 'datePicker'" v-model="item.value1" type="datetimerange" range-separator="-" :start-placeholder="t('ts.开始时间')" :end-placeholder="t('ts.结束时间')" style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x" format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled" /> |
|
|
|
<!-- 日期时间 --> |
|
|
|
<el-date-picker v-else-if="getInputType(item.column) == 'monthPicker'" v-model="item.value1" type="monthrange" range-separator="-" :start-placeholder="t('ts.开始月份')" :end-placeholder="t('ts.结束月份')" style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'monthrange')" value-format="YYYY-MM" format="YYYY/MM" :disabled="item.disabled" /> |
|
|
|
</div> |
|
|
|
<!-- 删除条件按钮 --> |
|
|
|
<el-button type="danger" :icon="Minus" circle size="small" |
|
|
|
@click="moreListDelete(index, item, $event)" /> |
|
|
|
<el-button type="danger" :icon="Minus" circle size="small" @click="moreListDelete(index, item, $event)" /> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<!-- 添加筛选条件 --> |
|
|
|
@ -193,6 +192,8 @@ const moreListOptions = ref({ |
|
|
|
} else if (type?.form?.component == 'DatePicker') { |
|
|
|
if(type?.form?.componentProps?.type=='datetimerange'|| type?.form?.componentProps?.type == 'datetime'){ |
|
|
|
data = 'datePicker' |
|
|
|
} else if(type?.form?.componentProps?.type=='monthrange'|| type?.form?.componentProps?.type == 'month'){ |
|
|
|
data = 'monthPicker' |
|
|
|
} else if(type?.form?.componentProps?.type == 'date'){ |
|
|
|
data = 'date' |
|
|
|
} |
|
|
|
@ -221,7 +222,7 @@ const getFilterable = (val) => { |
|
|
|
// 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,between,isNull,isNotNull |
|
|
|
const formatMoreListActions = (val) => { |
|
|
|
if (val) { |
|
|
|
if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'){ |
|
|
|
if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'|| getInputType(val.column) == 'monthPicker'){ |
|
|
|
return moreListOptions.value.action.filter(item => item.value == 'between') |
|
|
|
}else{ |
|
|
|
return moreListOptions.value.action.filter(item => item.value != 'between') |
|
|
|
@ -255,7 +256,7 @@ const moreListPush = () => { |
|
|
|
const lastestType = ref('') |
|
|
|
// 筛选条件改变重置其他项 |
|
|
|
const resetSelect = (val) => { |
|
|
|
if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date') { |
|
|
|
if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date'|| getInputType(val.column) == 'monthPicker') { |
|
|
|
val.action = 'between' |
|
|
|
val.disabled = false |
|
|
|
}else{ |
|
|
|
@ -285,11 +286,12 @@ const actionSelect = (val)=>{ |
|
|
|
|
|
|
|
// 查询 重置按钮事件 |
|
|
|
const buttonBaseClick = (val) => { |
|
|
|
console.log(moreListData.value.filters) |
|
|
|
if (val == 'search') { // 查询 |
|
|
|
let data = [] |
|
|
|
moreListData.value.filters.forEach(item => { |
|
|
|
let obj = {} |
|
|
|
if(item.value1&&item.value1.length>0 || (item.value1&&typeof item.value1 === 'number')){ |
|
|
|
if(item.value1&&item.value1.length>0&&!item.value || (item.value1&&typeof item.value1 === 'number')){ |
|
|
|
obj = { |
|
|
|
column: item.column, |
|
|
|
action: item.action, |
|
|
|
@ -363,6 +365,12 @@ const changeDateTimePicker = (e, val,from) =>{ |
|
|
|
let startTime = new Date(e[0] + ' 00:00:00').getTime() |
|
|
|
let endTime = new Date(e[1] + ' 23:59:59').getTime() |
|
|
|
val.value = startTime + ',' + endTime |
|
|
|
}else if(from == 'monthrange'){ |
|
|
|
let startTime = new Date(e[0] + '-01 00:00:00').getTime() |
|
|
|
const lastDay = new Date(e[1].split('-')[0],e[1].split('-')[1], 0).getDate(); |
|
|
|
let endTime = new Date(e[1] + '-'+lastDay+' 23:59:59').getTime() |
|
|
|
val.value = startTime + ',' + endTime |
|
|
|
console.log(val) |
|
|
|
}else if(from == 'datetimerange'){ |
|
|
|
val.value = e.join(',') |
|
|
|
} |
|
|
|
|
