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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -947,12 +947,16 @@
                             placeholder="根据标准号/名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button size="mini" class="common-button-primary" type="primary" icon="el-icon-search"
-                             @click="selectConfiguraStand(true)"></el-button>
+                  <el-button size="mini" class="common-button-primary" type="primary"
+                             @click="selectConfiguraStand(true)">
+                    查询
+                  </el-button>
                 </el-form-item>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button size="mini" class="common-button-default" icon="el-icon-refresh-left"
-                             @click="clearAllSearch(3)"></el-button>
+                  <el-button size="mini" class="common-button-default"
+                             @click="clearAllSearch(3)">
+                    清空
+                  </el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -1683,7 +1687,7 @@
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
                   <!--            采标编号-->
-                  <el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
+                  <el-form-item label="采标===编号" prop="nameShow" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>