Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -211,17 +211,17 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button
|
||||||
icon="el-icon-search"
|
size="mini"
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary"
|
class="common-button-primary"
|
||||||
@click="handleSearchStandard"
|
@click="handleSearchStandard">
|
||||||
round>
|
查询
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
|
size="mini"
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
icon="el-icon-refresh-left"
|
@click="handleResetSearch">
|
||||||
@click="handleResetSearch"
|
清空
|
||||||
round>
|
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|||||||
@@ -246,17 +246,17 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button
|
||||||
icon="el-icon-search"
|
size="mini"
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary"
|
class="common-button-primary"
|
||||||
@click="getDomesticStandardTable"
|
@click="getDomesticStandardTable">
|
||||||
round>
|
查询
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
icon="el-icon-refresh-left"
|
size="mini"
|
||||||
@click="handleResetSearch"
|
@click="handleResetSearch">
|
||||||
round>
|
清空
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|||||||
@@ -36,16 +36,14 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="search-item btn-box">
|
<el-form-item class="search-item btn-box">
|
||||||
<el-button
|
<el-button
|
||||||
icon="el-icon-search"
|
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary"
|
class="common-button-primary"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="selectProcessBtn"></el-button>
|
@click="selectProcessBtn">查询</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
icon="el-icon-refresh-left"
|
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="resetSelect"></el-button>
|
@click="resetSelect">清空</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="search-area-item">
|
<div class="search-area-item">
|
||||||
|
|||||||
@@ -36,16 +36,14 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="search-item btn-box">
|
<el-form-item class="search-item btn-box">
|
||||||
<el-button
|
<el-button
|
||||||
icon="el-icon-search"
|
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary"
|
class="common-button-primary"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="selectProcessBtn"></el-button>
|
@click="selectProcessBtn">查询</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
icon="el-icon-refresh-left"
|
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="resetSelect"></el-button>
|
@click="resetSelect">清空</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="search-area-item">
|
<div class="search-area-item">
|
||||||
|
|||||||
@@ -36,16 +36,14 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="search-item btn-box">
|
<el-form-item class="search-item btn-box">
|
||||||
<el-button
|
<el-button
|
||||||
icon="el-icon-search"
|
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary"
|
class="common-button-primary"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="selectProcessBtn"></el-button>
|
@click="selectProcessBtn">查询</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
icon="el-icon-refresh-left"
|
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="resetSelect"></el-button>
|
@click="resetSelect">清空</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="search-area-item">
|
<div class="search-area-item">
|
||||||
|
|||||||
@@ -36,16 +36,14 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="search-item btn-box">
|
<el-form-item class="search-item btn-box">
|
||||||
<el-button
|
<el-button
|
||||||
icon="el-icon-search"
|
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary"
|
class="common-button-primary"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="selectProcessBtn"></el-button>
|
@click="selectProcessBtn">查询</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
icon="el-icon-refresh-left"
|
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="resetSelect"></el-button>
|
@click="resetSelect">清空</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="search-area-item">
|
<div class="search-area-item">
|
||||||
|
|||||||
Reference in New Issue
Block a user