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:
fanlin
2021-07-30 17:24:53 +08:00
parent 7e9c8e53ad 3f873b0285
commit 03b44bb869
12 changed files with 1732 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+6 -6
View File
@@ -60,7 +60,7 @@
</el-table-column>
<el-table-column
prop="standNumber"
label="项目编号"
label="标准号"
fixed="left"
width="260px"
>
@@ -580,7 +580,7 @@ export default {
this.active = -1
}
}
// 考虑如果没有当前时间， 颜色怎么设置
// 考虑如果没有当前时间，颜色怎么设置
})
this.selectTableDataList()
},
@@ -611,8 +611,8 @@ export default {
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL)
window.open(exportURL)
console.log(exportURL,'_self')
window.open(exportURL,'_self')
this.$message.success('导出信息成功')
}
} else if (this.saveExportType === 'all') {
@@ -629,8 +629,8 @@ export default {
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL)
window.open(exportURL)
console.log(exportURL,'_self')
window.open(exportURL,'_self')
this.$message.success('导出信息成功')
}
}
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+4 -4
View File
@@ -119,7 +119,7 @@
align="center">
</el-table-column>
<el-table-column
prop="standId"
prop="standSerialNumber"
fixed="left"
width="180"
label="标准号">
@@ -128,7 +128,7 @@
<!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;-->
<!-- </template>-->
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -137,7 +137,7 @@
width="180"
label="标准名称">
<template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
@@ -613,7 +613,7 @@ export default {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}