WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xiejunyu
2022-02-11 18:01:40 +08:00
parent 933fa90d3a 9d4a808515
commit 3f4fe0c76e
2 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/addForm/index.vue
+2 -1
View File
@@ -58,7 +58,8 @@
<span :class="{'title-text-text':false}">{{item.name}}</span> <span :class="{'title-text-text':false}">{{item.name}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.attrModel"> <a-form-model-item class="itemModel" :prop="item.attrModel">
<a-range-picker class="box-input" v-model="formInline[item.attrModel]" @change="onChange"></a-range-picker> <a-range-picker class="box-input" v-model="formInline[item.attrModel]"
@change="onChange"></a-range-picker>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
jero-web/src/components/search/index.vue
+76 -31
View File
@@ -2,43 +2,85 @@
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px"> <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
<div class="box-title-text" v-if="item.field_show_type == 'text'"> <template v-if="index < 2">
<div class="title-text"> <div class="box-title-text" v-if="item.field_show_type == 'text'">
<span>{{item.db_field_en_name}}</span><br> <div class="title-text">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_en_name}}</span><br>
<span>{{item.db_field_txt}}</span>
</div>
<a-input class="box-input" :placeholder="item.placeholder"
v-model="queryParam[item.db_field_name]"></a-input>
</div> </div>
<a-input class="box-input" :placeholder="item.placeholder" v-model="queryParam[item.db_field_name]"></a-input> <div class="box-title-text" v-else-if="item.field_show_type == 'list_multi'">
</div> <div class="title-text">
<div class="box-title-text" v-else-if="item.field_show_type == 'list_multi'"> <span>{{item.db_field_en_name}}</span><br>
<div class="title-text"> <span>{{item.db_field_txt}}</span>
<span>{{item.db_field_en_name}}</span><br> </div>
<span>{{item.db_field_txt}}</span> <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
:placeholder="$t('selectStatus')" :type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/>
</div> </div>
<j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]" <div class="box-title-text" v-else-if="item.field_show_type == 'date'">
:placeholder="$t('selectStatus')" :type="'select'" <div class="title-text">
:triggerChange="false" :dictCode="item.dict_field"/> <span>{{item.db_field_en_name}}</span><br>
</div> <span>{{item.db_field_txt}}</span>
<div class="box-title-text" v-else-if="item.field_show_type == 'date'"> </div>
<div class="title-text"> <a-date-picker class="box-input" v-model="queryParam[item.db_field_name]"/>
<span>{{item.db_field_en_name}}</span><br>
<span>{{item.db_field_txt}}</span>
</div> </div>
<a-date-picker class="box-input" v-model="queryParam[item.db_field_name]"/> <div class="box-title-text" v-else-if="item.field_show_type == 'list'">
</div> <div class="title-text">
<div class="box-title-text" v-else-if="item.field_show_type == 'list'"> <span>{{item.db_field_en_name}}</span><br>
<div class="title-text"> <span>{{item.db_field_txt}}</span>
<span>{{item.db_field_en_name}}</span><br> </div>
<span>{{item.db_field_txt}}</span> <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
:placeholder="$t('selectStatus')" :type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/>
</div> </div>
<j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]" </template>
:placeholder="$t('selectStatus')" :type="'select'" <template v-if="toggleSearchStatus && index >= 2">
:triggerChange="false" :dictCode="item.dict_field"/> <div class="box-title-text" v-if="item.field_show_type == 'text'">
</div> <div class="title-text">
<span>{{item.db_field_en_name}}</span><br>
<span>{{item.db_field_txt}}</span>
</div>
<a-input class="box-input" :placeholder="item.placeholder"
v-model="queryParam[item.db_field_name]"></a-input>
</div>
<div class="box-title-text" v-else-if="item.field_show_type == 'list_multi'">
<div class="title-text">
<span>{{item.db_field_en_name}}</span><br>
<span>{{item.db_field_txt}}</span>
</div>
<j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
:placeholder="$t('selectStatus')" :type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/>
</div>
<div class="box-title-text" v-else-if="item.field_show_type == 'date'">
<div class="title-text">
<span>{{item.db_field_en_name}}</span><br>
<span>{{item.db_field_txt}}</span>
</div>
<a-date-picker class="box-input" v-model="queryParam[item.db_field_name]"/>
</div>
<div class="box-title-text" v-else-if="item.field_show_type == 'list'">
<div class="title-text">
<span>{{item.db_field_en_name}}</span><br>
<span>{{item.db_field_txt}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
:placeholder="$t('selectStatus')" :type="'select'"
:triggerChange="false" :dictCode="item.dict_field"/>
</div>
</template>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length >= 2">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
@@ -67,7 +109,8 @@
}, },
data() { data() {
return { return {
queryParam: {} queryParam: {},
toggleSearchStatus:false,
} }
}, },
mounted() { mounted() {
@@ -88,10 +131,12 @@
getAction(this.url.seachList, params).then((res) => { getAction(this.url.seachList, params).then((res) => {
if (res.success) { if (res.success) {
this.searchList = res.result this.searchList = res.result
console.log('reList',this.searchList)
} }
}) })
} },
handleToggleSearch(){
this.toggleSearchStatus = !this.toggleSearchStatus
},
} }
} }
</script> </script>