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:
yanyizhou
2021-08-30 17:57:13 +08:00
parent 12371449b8 9e729793e3
commit 2918c418a2
3 changed files with 715 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+705 -599
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+7
View File
@@ -2613,6 +2613,13 @@ export default {
}, },
// 清空搜索框 // 清空搜索框
clearAllSearch (flag) { clearAllSearch (flag) {
if (flag==='standCommonlySearch'){
this.standCommonlySearch.standNumber='';
this.standCommonlySearch.standSort='';
this.standCommonlySearch.page=1;
}
this.getDomesticStandardTable(this.standCommonlySearch)
if (flag === 'sarStandardsSearch') { if (flag === 'sarStandardsSearch') {
this.sarStandardsSearch.standSort = '' this.sarStandardsSearch.standSort = ''
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+3 -3
View File
@@ -39,9 +39,9 @@
</div> </div>
</el-card> </el-card>
<div class="action-bar"> <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="transfer">调取</el-button>-->
<el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除 <!-- <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除-->
</el-button> <!-- </el-button>-->
<el-button class="common-button-default export-button" <el-button class="common-button-default export-button"
size="mini" @click="exportStandard" size="mini" @click="exportStandard"
v-btn-permission="''" v-btn-permission="''"