|
@@ -36,11 +36,10 @@
|
|
|
:disabled="lock"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
- <el-button class="bule" icon="el-icon-search" @click="searchBtn(0)">检索</el-button>
|
|
|
- </el-form-item>
|
|
|
</el-form>
|
|
|
- <div style="margin: 15px" />
|
|
|
+ <div style="margin: 15px">
|
|
|
+ <el-button type="primary" class="long-btn" @click="searchBtn(0)">检索</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<!-- 高级检索 -->
|
|
|
<div v-if="choice == 1" class="barBtn">
|
|
@@ -155,7 +154,7 @@
|
|
|
</div>
|
|
|
<div v-if="choice == 1" class="fBtn" style="position: relative">
|
|
|
<el-button class="btn11" @click="reset">重置条件</el-button>
|
|
|
- <el-button type="primary" @click="searchBtn(1)">检索</el-button>
|
|
|
+ <el-button type="primary" class="long-btn" @click="searchBtn(1)">检索</el-button>
|
|
|
</div>
|
|
|
<!-- 专业检索 -->
|
|
|
<ProfessionSearchVue ref="professionSearch" v-if="choice == 2" @search="handleProfessionSearchFn" @export="handelExport" @reset="handleReset" />
|
|
@@ -729,6 +728,9 @@ export default {
|
|
|
limit: this.paginationData.pageSize,
|
|
|
page: this.paginationData.currentPage // 是当前页数 默认是0 。普通检索的参数是
|
|
|
};
|
|
|
+ if (this.$route.query.code) {
|
|
|
+ pramse.code = this.$route.query.code
|
|
|
+ }
|
|
|
if (this.sort.length) {
|
|
|
pramse.sort = this.sort
|
|
|
}
|
|
@@ -822,6 +824,9 @@ export default {
|
|
|
page_size: pageSize,
|
|
|
page: currentPage
|
|
|
}
|
|
|
+ if (this.$route.query.code) {
|
|
|
+ queryData.code = this.$route.query.code
|
|
|
+ }
|
|
|
if (this.sort.length) {
|
|
|
queryData.sort = this.sort
|
|
|
}
|