修改全局的搜索条件时间改完范围搜索

This commit is contained in:
qq787203167
2022-04-02 10:15:50 +08:00
parent 65b7487eb6
commit 5328319e31
3 changed files with 52 additions and 39 deletions
@@ -123,9 +123,13 @@
this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
}, },
onChange(item) { onChange(item) {
let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD') if (this.queryParam[item] && this.queryParam[item].length > 0) {
let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD') let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
this.queryParam[item] = [dateOne, dateTwo] let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
this.queryParam[item] = [dateOne, dateTwo]
} else {
this.queryParam[item] = []
}
} }
} }
} }
+29 -25
View File
@@ -47,15 +47,15 @@
:placeholder="$t('PleaseSelect')+item.db_field_txt" :placeholder="$t('PleaseSelect')+item.db_field_txt"
@change="onChange(item.db_field_name)"></a-range-picker> @change="onChange(item.db_field_name)"></a-range-picker>
</div> </div>
<!-- <div class="box-title-text" v-else-if="item.field_show_type == '5'">--> <!-- <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
<!-- <div class="title-text" :title="item.db_field_txt">--> <!-- <div class="title-text" :title="item.db_field_txt">-->
<!-- <span>{{item.db_field_txt}}</span>--> <!-- <span>{{item.db_field_txt}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-date-picker class="box-input"--> <!-- <a-date-picker class="box-input"-->
<!-- :placeholder="$t('PleaseSelect')+item.db_field_txt"--> <!-- :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
<!-- @change="dateChange(item.db_field_name)"--> <!-- @change="dateChange(item.db_field_name)"-->
<!-- v-model="queryParam[item.db_field_name]"/>--> <!-- v-model="queryParam[item.db_field_name]"/>-->
<!-- </div>--> <!-- </div>-->
<div class="box-title-text" v-else-if="item.field_show_type == '3'"> <div class="box-title-text" v-else-if="item.field_show_type == '3'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
@@ -65,7 +65,7 @@
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/> :triggerChange="false" :dictCode="item.dict_field"/>
</div> </div>
</template > </template>
<template v-if="index >= 3 && toggleSearchStatus"> <template v-if="index >= 3 && toggleSearchStatus">
<div class="box-title-text" v-if="item.field_show_type == '0'"> <div class="box-title-text" v-if="item.field_show_type == '0'">
@@ -111,15 +111,15 @@
<a-range-picker class="box-input" v-model="queryParam[item.db_field_name]" <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
@change="onChange(item.db_field_name)"></a-range-picker> @change="onChange(item.db_field_name)"></a-range-picker>
</div> </div>
<!-- <div class="box-title-text" v-else-if="item.field_show_type == '5'">--> <!-- <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
<!-- <div class="title-text" :title="item.db_field_txt">--> <!-- <div class="title-text" :title="item.db_field_txt">-->
<!-- <span>{{item.db_field_txt}}</span>--> <!-- <span>{{item.db_field_txt}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-date-picker class="box-input"--> <!-- <a-date-picker class="box-input"-->
<!-- :placeholder="$t('PleaseSelect')+item.db_field_txt"--> <!-- :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
<!-- @change="dateChange(item.db_field_name)"--> <!-- @change="dateChange(item.db_field_name)"-->
<!-- v-model="queryParam[item.db_field_name]"/>--> <!-- v-model="queryParam[item.db_field_name]"/>-->
<!-- </div>--> <!-- </div>-->
<div class="box-title-text" v-else-if="item.field_show_type == '3'"> <div class="box-title-text" v-else-if="item.field_show_type == '3'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
@@ -198,13 +198,17 @@
this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
}, },
onChange(item) { onChange(item) {
let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD') if (this.queryParam[item] && this.queryParam[item].length > 0) {
let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD') let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
this.queryParam[item] = [dateOne, dateTwo] let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
}, this.queryParam[item] = [dateOne, dateTwo]
handleToggleSearch(){ } else {
this.toggleSearchStatus = !this.toggleSearchStatus this.queryParam[item] = []
}
}, },
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
}
} }
} }
</script> </script>
@@ -45,13 +45,13 @@
:placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'" :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/> :triggerChange="false" :dictCode="item.dict_field"/>
</div> </div>
<!-- <div class="text-left-select" v-if="item.field_show_type == '5'">--> <!-- <div class="text-left-select" v-if="item.field_show_type == '5'">-->
<!-- <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>--> <!-- <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>-->
<!-- <a-date-picker class="text-select"--> <!-- <a-date-picker class="text-select"-->
<!-- :placeholder="$t('PleaseSelect')+item.db_field_txt"--> <!-- :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
<!-- @change="dateChange(item.db_field_name)"--> <!-- @change="dateChange(item.db_field_name)"-->
<!-- v-model="queryParamOne[item.db_field_name]"/>--> <!-- v-model="queryParamOne[item.db_field_name]"/>-->
<!-- </div>--> <!-- </div>-->
<div class="text-left-select" v-if="item.field_show_type == '6' || item.field_show_type == '5'"> <div class="text-left-select" v-if="item.field_show_type == '6' || item.field_show_type == '5'">
<span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span> <span class="text-sel" :title="item.db_field_txt">{{item.db_field_txt}}</span>
<a-range-picker class="text-select" v-model="queryParamOne[item.db_field_name]" <a-range-picker class="text-select" v-model="queryParamOne[item.db_field_name]"
@@ -449,10 +449,15 @@
this.queryParamOne[item + '_name'] = this.queryParamOne[item + '_name'] ? moment(this.queryParamOne[item + '_name']).format('YYYY-MM-DD') : '' this.queryParamOne[item + '_name'] = this.queryParamOne[item + '_name'] ? moment(this.queryParamOne[item + '_name']).format('YYYY-MM-DD') : ''
}, },
onChange(item) { onChange(item) {
let dateOne = moment(this.queryParamOne[item][0]).format('YYYY-MM-DD') if (this.queryParamOne[item] && this.queryParamOne[item].length > 0) {
let dateTwo = moment(this.queryParamOne[item][1]).format('YYYY-MM-DD') let dateOne = moment(this.queryParamOne[item][0]).format('YYYY-MM-DD')
this.queryParamOne[item] = dateOne ? [dateOne, dateTwo] : [] let dateTwo = moment(this.queryParamOne[item][1]).format('YYYY-MM-DD')
this.queryParamOne[item + '_name'] = dateOne ? [dateOne, dateTwo] : [] this.queryParamOne[item] = [dateOne, dateTwo]
this.queryParamOne[item + '_name'] = [dateOne, dateTwo]
} else {
this.queryParamOne[item] = []
this.queryParamOne[item + '_name'] = []
}
}, },
getCondition() { getCondition() {
let query = { let query = {