Merge branch 'develop' into FOTON
# Conflicts: # src/components/navMenu/index.vue
This commit is contained in:
Superman_Main
@@ -956,20 +956,21 @@
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
round
|
||||
@click="getReplaceLawsNumRowFirst">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
icon="el-icon-refresh-left"
|
||||
round
|
||||
size="mini"
|
||||
type="default"
|
||||
@click="getResetLawsNumRow"></el-button>
|
||||
@click="getResetLawsNumRow">
|
||||
清空
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -1126,17 +1127,19 @@
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
icon="el-icon-search"
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
@click="handleSearchStandard"
|
||||
round>
|
||||
size="mini"
|
||||
style="margin-left: 5px"
|
||||
@click="handleSearchStandard">
|
||||
查询
|
||||
</el-button>
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="handleResetSearch"
|
||||
round></el-button>
|
||||
size="mini"
|
||||
@click="handleResetSearch">
|
||||
清空
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model.number="form.standYear"
|
||||
v-model="form.standYear"
|
||||
placeholder="请输入标准标准年份"
|
||||
clearable
|
||||
></el-input>
|
||||
@@ -1257,20 +1257,21 @@
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
round
|
||||
@click="getReplaceLawsNumRowFirst">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
icon="el-icon-refresh-left"
|
||||
round
|
||||
size="mini"
|
||||
type="default"
|
||||
@click="getResetLawsNumRow"></el-button>
|
||||
@click="getResetLawsNumRow">
|
||||
清空
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<div style="flex: auto; overflow: auto;" v-show="active === '1'">
|
||||
<div style="flex: auto;" v-show="active === '1'">
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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">
|
||||
|
||||
Reference in New Issue
Block a user