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

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2613,6 +2613,13 @@ export default {
     },
     // 清空搜索框
     clearAllSearch (flag) {
+      if (flag==='standCommonlySearch'){
+        this.standCommonlySearch.standNumber='';
+        this.standCommonlySearch.standSort='';
+        this.standCommonlySearch.page=1;
+
+      }
+      this.getDomesticStandardTable(this.standCommonlySearch)
 
       if (flag === 'sarStandardsSearch') {
         this.sarStandardsSearch.standSort = ''

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -39,9 +39,9 @@
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>
-        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除
-        </el-button>
+<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>-->
+<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除-->
+<!--        </el-button>-->
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
                    v-btn-permission="''"