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:
super_liu
2022-03-30 14:52:20 +08:00
parent 4ccef0588b 450731bdb6
commit 7c4355042c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
-1
View File
@@ -315,7 +315,6 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="textStatus" prop="textStatus"
sortable="custom"
width="110" width="110"
label="文本状态"> label="文本状态">
<!-- <template slot="header" slot-scope="scope">--> <!-- <template slot="header" slot-scope="scope">-->
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+4 -2
View File
@@ -83,7 +83,7 @@
添加 添加
</el-button> </el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll" v-btn-permission="'5af38c3aaad325741045c4db44e6850e'">导出</el-button> <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll" v-btn-permission="'5af38c3aaad325741045c4db44e6850e'">导出</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll1" v-btn-permission="'d5a02a1e7a5bf9047e81a35bdc8d3a40'">导出上报意见</el-button> <el-button v-if="!ideaKey" type="primary" class="common-button-primary" size="mini" @click="exportAll1" v-btn-permission="'d5a02a1e7a5bf9047e81a35bdc8d3a40'">导出上报意见</el-button>
</div> </div>
<div class="container"> <div class="container">
<el-table <el-table
@@ -326,7 +326,9 @@ export default {
return '上报' return '上报'
} else if (row === '2') { } else if (row === '2') {
return '处理后上报' return '处理后上报'
} else { } else if (!row) {
return ''
}else {
return '不上报' return '不上报'
} }
}, },