update 系统管理搜索调整
This commit is contained in:
@@ -235,5 +235,8 @@ export default {
|
|||||||
background: #f4f4f4;
|
background: #f4f4f4;
|
||||||
color: #bababa;
|
color: #bababa;
|
||||||
}
|
}
|
||||||
|
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
|
||||||
|
min-width: 40px;
|
||||||
|
}
|
||||||
//update--begin--autor:wangshuai-----date:20191204------for:系统管理 数据字典禁用和正常区别开,添加背景颜色 teambition JT-22------
|
//update--begin--autor:wangshuai-----date:20191204------for:系统管理 数据字典禁用和正常区别开,添加背景颜色 teambition JT-22------
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -5,22 +5,20 @@
|
|||||||
<div class="table-page-search-wrapper">
|
<div class="table-page-search-wrapper">
|
||||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||||
<a-row :gutter="12">
|
<a-row :gutter="12">
|
||||||
<a-col :md="7" :sm="8">
|
<a-col :md="6" :sm="12">
|
||||||
<a-form-item :label="$t('dict.dictionaryName')" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
|
<a-form-item :label="$t('dict.dictionaryName')" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
|
||||||
<j-input :placeholder="$t('pleaseEnter')+$t('dict.dictionaryName')" v-model="queryParam.dictName"></j-input>
|
<j-input :placeholder="$t('pleaseEnter')+$t('dict.dictionaryName')" v-model="queryParam.dictName"></j-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="7" :sm="8">
|
<a-col :md="6" :sm="12">
|
||||||
<a-form-item :label="$t('dict.dictionaryNumber')" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
|
<a-form-item :label="$t('dict.dictionaryNumber')" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
|
||||||
<j-input :placeholder="$t('pleaseEnter')+$t('dict.dictionaryNumber')" v-model="queryParam.dictCode"></j-input>
|
<j-input :placeholder="$t('pleaseEnter')+$t('dict.dictionaryNumber')" v-model="queryParam.dictCode"></j-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="7" :sm="8">
|
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
||||||
<a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
|
<a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
|
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
|
||||||
</span>
|
</div>
|
||||||
</a-col>
|
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
|
|
||||||
@@ -215,4 +213,7 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@assets/less/common.less';
|
@import '~@assets/less/common.less';
|
||||||
|
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
|
||||||
|
min-width: 60px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -7,9 +7,9 @@
|
|||||||
<!-- 搜索区域 -->
|
<!-- 搜索区域 -->
|
||||||
<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="12" :sm="8">
|
<a-col :md="6" :sm="12">
|
||||||
<a-form-item :label="$t('roleManage.roleName')" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
|
<a-form-item :label="$t('roleManage.roleName')" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
|
||||||
<j-input placeholder="" v-model="queryParam.roleName"></j-input>
|
<j-input :placeholder="$t('pleaseEnter') + $t('roleManage.roleName')" v-model="queryParam.roleName"></j-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<!--
|
<!--
|
||||||
@@ -21,12 +21,10 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
-->
|
-->
|
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
||||||
<a-col :md="12" :sm="24">
|
|
||||||
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button>
|
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button>
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
|
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
|
||||||
</a-col>
|
</div>
|
||||||
</span>
|
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -533,4 +531,8 @@ export default {
|
|||||||
.ant-btn {
|
.ant-btn {
|
||||||
margin-left: 8px
|
margin-left: 8px
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
|
||||||
|
min-width: 60px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="12">
|
||||||
<a-form-item :label="$t('user.gender')">
|
<a-form-item :label="$t('user.gender')">
|
||||||
<a-select v-model="queryParam.sex" :placeholder="$t('pleaseSelect') + $t('user.gender')">
|
<a-select v-model="queryParam.sex" :placeholder="$t('pleaseSelect') + $t('user.gender')">
|
||||||
<a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
|
<a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
|
||||||
@@ -22,20 +22,19 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
<template v-if="toggleSearchStatus">
|
<a-col :md="6" :sm="12">
|
||||||
<a-col :md="6" :sm="8">
|
|
||||||
<a-form-item :label="$t('user.realName')">
|
<a-form-item :label="$t('user.realName')">
|
||||||
<j-input :placeholder="$t('pleaseEnter') + $t('user.realName')" v-model="queryParam.realname"></j-input>
|
<j-input :placeholder="$t('pleaseEnter') + $t('user.realName')" v-model="queryParam.realname"></j-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<template v-if="toggleSearchStatus">
|
||||||
|
<a-col :md="6" :sm="12">
|
||||||
<a-form-item :label="$t('phoneNumber')">
|
<a-form-item :label="$t('phoneNumber')">
|
||||||
<a-input :placeholder="$t('user.pleaseEnterFullPhone')" v-model="queryParam.phone"></a-input>
|
<a-input :placeholder="$t('user.pleaseEnterFullPhone')" v-model="queryParam.phone"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<a-col :md="6" :sm="12">
|
||||||
<a-col :md="6" :sm="8">
|
|
||||||
<a-form-item :label="$t('user.userStatues')">
|
<a-form-item :label="$t('user.userStatues')">
|
||||||
<a-select v-model="queryParam.status" :placeholder="$t('pleaseSelect')">
|
<a-select v-model="queryParam.status" :placeholder="$t('pleaseSelect')">
|
||||||
<a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
|
<a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
|
||||||
@@ -45,7 +44,7 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="12">
|
||||||
<a-form-item :label="$t('organization')">
|
<a-form-item :label="$t('organization')">
|
||||||
<a-tree-select
|
<a-tree-select
|
||||||
tree-node-filter-prop="title"
|
tree-node-filter-prop="title"
|
||||||
@@ -61,7 +60,7 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="12">
|
||||||
<a-form-item :label="$t('role')">
|
<a-form-item :label="$t('role')">
|
||||||
<j-search-select-tag
|
<j-search-select-tag
|
||||||
:placeholder="$t('pleaseSelect') + $t('role')"
|
:placeholder="$t('pleaseSelect') + $t('role')"
|
||||||
@@ -72,17 +71,14 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
||||||
<a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
|
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
|
|
||||||
<a @click="handleToggleSearch" style="margin-left: 8px">
|
<a @click="handleToggleSearch" style="margin-left: 8px">
|
||||||
{{ toggleSearchStatus ? $t('putAway') : $t('open') }}
|
{{ toggleSearchStatus ? $t('putAway') : $t('open') }}
|
||||||
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
|
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
|
||||||
</a>
|
</a>
|
||||||
</span>
|
<a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
|
||||||
</a-col>
|
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
|
||||||
|
</div>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -453,5 +449,7 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@assets/less/common.less';
|
@import '~@assets/less/common.less';
|
||||||
|
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
|
||||||
|
min-width: 80px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -180,4 +180,7 @@ export default {
|
|||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
@import '~@assets/less/common.less';
|
@import '~@assets/less/common.less';
|
||||||
|
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
|
||||||
|
min-width: 80px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -455,4 +455,8 @@ export default {
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
|
||||||
|
min-width: 60px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -10,12 +10,10 @@
|
|||||||
<a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
|
<a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
||||||
<a-col :md="6" :sm="24">
|
|
||||||
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
|
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
||||||
</a-col>
|
</div>
|
||||||
</span>
|
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -315,4 +313,8 @@ export default {
|
|||||||
margin-top: -16px;
|
margin-top: -16px;
|
||||||
margin-bottom: 16px;
|
margin-bottom: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
|
||||||
|
min-width: 80px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user