Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-22 15:57:34 +08:00
6 changed files with 20 additions and 28 deletions
@@ -211,17 +211,17 @@
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-search"
size="mini"
type="primary"
class="common-button-primary"
@click="handleSearchStandard"
round>
@click="handleSearchStandard">
查询
</el-button>
<el-button
size="mini"
class="common-button-default"
icon="el-icon-refresh-left"
@click="handleResetSearch"
round>
@click="handleResetSearch">
清空
</el-button>
</el-form-item>
</el-form>
@@ -246,17 +246,17 @@
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-search"
size="mini"
type="primary"
class="common-button-primary"
@click="getDomesticStandardTable"
round>
@click="getDomesticStandardTable">
查询
</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
@click="handleResetSearch"
round>
size="mini"
@click="handleResetSearch">
清空
</el-button>
</el-form-item>
</el-form>
@@ -36,16 +36,14 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
size="mini"
@click="selectProcessBtn"></el-button>
@click="selectProcessBtn">查询</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
size="mini"
@click="resetSelect"></el-button>
@click="resetSelect">清空</el-button>
</el-form-item>
</div>
<div class="search-area-item">
@@ -36,16 +36,14 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
size="mini"
@click="selectProcessBtn"></el-button>
@click="selectProcessBtn">查询</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
size="mini"
@click="resetSelect"></el-button>
@click="resetSelect">清空</el-button>
</el-form-item>
</div>
<div class="search-area-item">
@@ -36,16 +36,14 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
size="mini"
@click="selectProcessBtn"></el-button>
@click="selectProcessBtn">查询</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
size="mini"
@click="resetSelect"></el-button>
@click="resetSelect">清空</el-button>
</el-form-item>
</div>
<div class="search-area-item">
@@ -36,16 +36,14 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
size="mini"
@click="selectProcessBtn"></el-button>
@click="selectProcessBtn">查询</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
size="mini"
@click="resetSelect"></el-button>
@click="resetSelect">清空</el-button>
</el-form-item>
</div>
<div class="search-area-item">