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

src/pages/localTool/standardRecognition/index.vue

@@ -272,20 +272,21 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                icon="el-icon-search"
                 type="primary"
                 class="common-button-primary"
-                round
+                size="small"
                 @click="searchLawBtn">
+              查询
             </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
                 type="default"
-                @click="clearLawBtn"></el-button>
+                size="small"
+                @click="clearLawBtn">
+              清空
+            </el-button>
           </el-form-item>
         </el-form>
         <loading :loading="lawInfoTableLoading">数据获取中</loading>

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -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>

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -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>

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -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">