|
|
@@ -311,6 +311,7 @@
|
|
|
@close="formDialogClose"
|
|
|
@export="exportExcel"
|
|
|
:ids="selectList"
|
|
|
+ :year="owerQuery.projectYear"
|
|
|
/>
|
|
|
<summary-dialog
|
|
|
:dialogType="diaType"
|
|
|
@@ -596,7 +597,6 @@ export default {
|
|
|
})
|
|
|
this.getTypeList()
|
|
|
this.getNumList()
|
|
|
- console.log(this.permissions.vaildPermission('projectApprovalBtn'))
|
|
|
},
|
|
|
unmounted() {
|
|
|
sessionStorage.removeItem('selectList')
|
|
|
@@ -610,8 +610,13 @@ export default {
|
|
|
},
|
|
|
onLoad(query = {}) {
|
|
|
this.loading = true
|
|
|
+ if (!Object.hasOwn(this.owerQuery, 'projectYear')) {
|
|
|
+ this.owerQuery.projectYear = new Date().getFullYear()
|
|
|
+ }
|
|
|
+ console.log(this.owerQuery)
|
|
|
const data = { ...this.owerQuery, parentId: this.parentId }
|
|
|
this.queryData = data
|
|
|
+ console.log(this.queryData)
|
|
|
this.$api.project
|
|
|
.projectList(this.page.currentPage, this.page.pageSize, this.queryData)
|
|
|
.then(res => {
|
|
|
@@ -878,14 +883,13 @@ export default {
|
|
|
this.diaType = -1
|
|
|
},
|
|
|
exportExcel(res, year) {
|
|
|
- console.log(year)
|
|
|
const data = Object.assign(
|
|
|
{ ...this.queryData },
|
|
|
{
|
|
|
columnName: res,
|
|
|
projectIds: this.selectList.join(','),
|
|
|
previewType: 1,
|
|
|
- year
|
|
|
+ projectYear: year
|
|
|
}
|
|
|
)
|
|
|
this.$router.push({ query: data, path: '/home/excel' })
|