update 查询重置顺序调整
This commit is contained in:
@@ -25,10 +25,10 @@
|
|||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
|
||||||
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">
|
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">
|
||||||
{{ $t('query') }}
|
{{ $t('query') }}
|
||||||
</a-button>
|
</a-button>
|
||||||
|
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
||||||
</span>
|
</span>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
<div class="table-page-search-wrapper search-box" :class="{'search-box-shadow': showSearch}">
|
<div class="table-page-search-wrapper search-box" :class="{'search-box-shadow': showSearch}">
|
||||||
<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="16" :sm="8">
|
<a-col :span="14">
|
||||||
<!-- 节点名称-->
|
<!-- 节点名称-->
|
||||||
<a-form-item :label="$t('businessSupport.standardizationActivity.nodeName')">
|
<a-form-item :label="$t('businessSupport.standardizationActivity.nodeName')">
|
||||||
<a-input v-model="nodeName"
|
<a-input v-model="nodeName"
|
||||||
@@ -36,17 +36,18 @@
|
|||||||
@input="handleSearch" />
|
@input="handleSearch" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="8" :sm="8">
|
<a-col :span="10">
|
||||||
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
||||||
<a-button class="box-button" @click="searchReset">{{ $t('reset') }}</a-button>
|
|
||||||
<a-button class="box-button"
|
<a-button class="box-button"
|
||||||
style="margin-left: 8px"
|
style="margin-left: 8px"
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="searchQuery"
|
@click="searchQuery"
|
||||||
|
icon="search"
|
||||||
v-has="'standardActivity:search'">{{
|
v-has="'standardActivity:search'">{{
|
||||||
$t('query')
|
$t('query')
|
||||||
}}
|
}}
|
||||||
</a-button>
|
</a-button>
|
||||||
|
<a-button class="box-button" icon="reload" @click="searchReset">{{ $t('reset') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -210,7 +211,11 @@ export default {
|
|||||||
this.$message.warning(this.$t('businessSupport.standardizationActivity.addUpToFourLevels'))
|
this.$message.warning(this.$t('businessSupport.standardizationActivity.addUpToFourLevels'))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.$refs.modalForm.add({ pid: this.selectedNodeId, supperName: this.selectedNode.name, level: this.selectedNode.level + 1 })
|
this.$refs.modalForm.add({
|
||||||
|
pid: this.selectedNodeId,
|
||||||
|
supperName: this.selectedNode.name,
|
||||||
|
level: this.selectedNode.level + 1
|
||||||
|
})
|
||||||
},
|
},
|
||||||
handleEdit () {
|
handleEdit () {
|
||||||
// 需要先选中一个节点
|
// 需要先选中一个节点
|
||||||
|
|||||||
@@ -54,8 +54,8 @@
|
|||||||
{{ toggleSearchStatus ? $t('putAway') : $t('open') }}
|
{{ toggleSearchStatus ? $t('putAway') : $t('open') }}
|
||||||
<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
|
<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
|
||||||
</a>
|
</a>
|
||||||
<a-button type="primary" @click="searchQuery" v-has="'customComparison:search'">{{ $t('query') }}</a-button>
|
<a-button type="primary" @click="searchQuery" icon="search" v-has="'customComparison:search'">{{ $t('query') }}</a-button>
|
||||||
<a-button style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
|
<a-button style="margin-left: 8px" @click="searchReset" icon="reload">{{ $t('reset') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
|
|||||||
@@ -27,8 +27,8 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
|
||||||
<a-button type="primary" @click="searchQuery" v-has="'documentComparison:search'">{{ $t('query') }}</a-button>
|
<a-button type="primary" @click="searchQuery" icon="search" v-has="'documentComparison:search'">{{ $t('query') }}</a-button>
|
||||||
<a-button style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
|
<a-button style="margin-left: 8px" icon="reload" @click="searchReset">{{ $t('reset') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
|
|||||||
@@ -30,10 +30,10 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
|
||||||
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'split:sarFileSplitInfo:search'">
|
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'split:sarFileSplitInfo:search'">
|
||||||
{{ $t('query') }}
|
{{ $t('query') }}
|
||||||
</a-button>
|
</a-button>
|
||||||
|
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
||||||
</span>
|
</span>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|||||||
@@ -51,7 +51,6 @@
|
|||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<div style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
<div style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
|
||||||
<a-button type="primary"
|
<a-button type="primary"
|
||||||
@click="searchQuery"
|
@click="searchQuery"
|
||||||
icon="search"
|
icon="search"
|
||||||
@@ -59,6 +58,7 @@
|
|||||||
v-has="'standardWarning:search'">
|
v-has="'standardWarning:search'">
|
||||||
{{ $t('query') }}
|
{{ $t('query') }}
|
||||||
</a-button>
|
</a-button>
|
||||||
|
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
|
||||||
<a-button type="primary"
|
<a-button type="primary"
|
||||||
@click="searchQuery"
|
@click="searchQuery"
|
||||||
icon="search"
|
icon="search"
|
||||||
@@ -19,6 +18,7 @@
|
|||||||
v-has="'dynamicMessage:search'">
|
v-has="'dynamicMessage:search'">
|
||||||
{{ $t('query') }}
|
{{ $t('query') }}
|
||||||
</a-button>
|
</a-button>
|
||||||
|
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
||||||
</span>
|
</span>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|||||||
@@ -87,7 +87,6 @@
|
|||||||
|
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<div style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
<div style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
||||||
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
|
||||||
<a-button type="primary"
|
<a-button type="primary"
|
||||||
@click="searchQuery"
|
@click="searchQuery"
|
||||||
icon="search"
|
icon="search"
|
||||||
@@ -95,6 +94,7 @@
|
|||||||
v-has="'profileCenter:table'">
|
v-has="'profileCenter:table'">
|
||||||
{{ $t('query') }}
|
{{ $t('query') }}
|
||||||
</a-button>
|
</a-button>
|
||||||
|
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|||||||
Reference in New Issue
Block a user