FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_test' into dev_20230829_change

Browse Source
This commit is contained in:
zyn
2023-11-20 09:13:59 +08:00
parent ab429566e3 f3fc569c6c
commit e7e463f7bf
16 changed files with 174 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
+3
View File
@@ -51,6 +51,9 @@
label="序号"
width="50"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
+3
View File
@@ -48,6 +48,9 @@
type="index"
label="序号"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
+3
View File
@@ -57,6 +57,9 @@
label="序号"
width="50"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
+3
View File
@@ -48,6 +48,9 @@
type="index"
label="序号"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
+3
View File
@@ -65,6 +65,9 @@
type="index"
width="50"
label="序号">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
+5 -1
View File
@@ -45,7 +45,11 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column align="center" type="index" width="50" label="序号"/>
<el-table-column align="center" type="index" width="50" label="序号">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column align="center" prop="scName" label="协会名称-标委会">
<template slot-scope="scope">
{{ scope.row.scName || '-' }}
src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
+3
View File
@@ -48,6 +48,9 @@
type="index"
label="序号"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -4
View File
@@ -4672,10 +4672,10 @@ export default {
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
if (tabFlag !== '') {
this.sarStandardsSearch.page = tabFlag.page
}
// let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
// if (tabFlag !== '') {
// this.sarStandardsSearch.page = tabFlag.page
// }
this.getDomesticStandardTable(this.sarStandardsSearch)
this.selectConfiguraStand()
// 此处需要调用接口，修改个人配置
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+3
View File
@@ -102,6 +102,9 @@
label="序号"
align="center"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (form.page - 1) * form.size }}
</template>
</el-table-column>
<el-table-column
prop="partCode"