FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
shenyanpei
2021-11-22 14:59:22 +08:00
parent 8c2f82442d d835e88ac9
commit b7fcb9486a
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardRecognition/index.vue
+6 -5
View File
@@ -272,20 +272,21 @@
</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"
round size="small"
@click="searchLawBtn"> @click="searchLawBtn">
查询
</el-button> </el-button>
</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
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left"
round
type="default" type="default"
@click="clearLawBtn"></el-button> size="small"
@click="clearLawBtn">
清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<loading :loading="lawInfoTableLoading">数据获取中</loading> <loading :loading="lawInfoTableLoading">数据获取中</loading>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+14 -11
View File
@@ -956,20 +956,21 @@
</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" size="mini"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="getReplaceLawsNumRowFirst"> @click="getReplaceLawsNumRowFirst">
查询
</el-button> </el-button>
</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
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="mini"
round
type="default" type="default"
@click="getResetLawsNumRow"></el-button> @click="getResetLawsNumRow">
清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -1126,17 +1127,19 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="handleSearchStandard" size="mini"
round> style="margin-left: 5px"
@click="handleSearchStandard">
查询
</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>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+6 -5
View File
@@ -1257,20 +1257,21 @@
</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" size="mini"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="getReplaceLawsNumRowFirst"> @click="getReplaceLawsNumRowFirst">
查询
</el-button> </el-button>
</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
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="mini"
round
type="default" type="default"
@click="getResetLawsNumRow"></el-button> @click="getResetLawsNumRow">
清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -4
View File
@@ -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">