diff --git a/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue b/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue index 2c2b26a..d6e61d6 100644 --- a/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue +++ b/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue @@ -200,6 +200,10 @@ export default { type: [Number, String], default: '', }, + proName: { + type: [String], + default: '', + }, }, data() { return { @@ -315,6 +319,7 @@ export default { month: row.tableMonth, proId: this.projectId, status: row.status, + proName: this.proName, }, }) }, @@ -326,6 +331,8 @@ export default { '/bmw/pmProject/exportThreeAndOne', { monthId: row.id, + month: row.tableMonth, + proName: this.proName, }, '三表一册.xlsx', ) diff --git a/src/views/synthesize-query/three-and-one/detail/index.vue b/src/views/synthesize-query/three-and-one/detail/index.vue index 61d7698..251f024 100644 --- a/src/views/synthesize-query/three-and-one/detail/index.vue +++ b/src/views/synthesize-query/three-and-one/detail/index.vue @@ -6,7 +6,7 @@ :projectId="projectId" :subComName="subComName" /> - + diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue b/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue index e1e6e45..a006efe 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue @@ -131,6 +131,10 @@ export default { type: [Number, String], default: '', }, + proName: { + type: [String], + default: '', + }, }, data() { return { @@ -227,6 +231,8 @@ export default { '/bmw/pmProject/exportUserAttendance', { ...this.attDetailsQueryParams, + proName: this.proName, + month: this.month, }, '分包人员考勤明细表.xlsx', ) diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue b/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue index 7528819..05c1609 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue @@ -184,6 +184,10 @@ export default { type: [Number, String], default: '', }, + proName: { + type: [String], + default: '', + }, }, computed: { @@ -290,6 +294,8 @@ export default { '/bmw/pmProject/exportThreeAndOne', { monthId: this.id, + proName: this.proName, + month: this.month, }, '三表一册.xlsx', ) diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue b/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue index 4d1e0b1..13d1927 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue @@ -125,6 +125,10 @@ export default { type: [Number, String], default: '', }, + proName: { + type: [String], + default: '', + }, }, data() { return { @@ -238,6 +242,7 @@ export default { '/bmw/pmProject/exportProMonthTableRoster', { ...this.nameListQueryParams, + proName: this.proName, }, '农民工花名册.xlsx', ) diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue b/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue index 8bb393f..b5e6e21 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue @@ -16,6 +16,7 @@ :id="id" :month="month" :status="status" + :proName="proName" :is="componentsList[activeName]" /> @@ -50,6 +51,10 @@ export default { type: [Number, String], default: '', }, + proName: { + type: [String], + default: '', + }, }, data() { return { diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue b/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue index d237338..92468ee 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue @@ -105,6 +105,10 @@ export default { type: [Number, String], default: '', }, + proName: { + type: [String], + default: '', + }, }, data() { return { @@ -206,6 +210,7 @@ export default { '/bmw/pmProject/exportUserSalaryApproval', { ...this.wageInfoQueryParams, + proName: this.proName, }, '农民工实名制工资信息报审表.xlsx', ) diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue b/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue index 304f65c..0601035 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue @@ -181,6 +181,10 @@ export default { type: [Number, String], default: '', }, + proName: { + type: [String], + default: '', + }, }, data() { return { @@ -307,6 +311,8 @@ export default { '/bmw/pmProject/exportUserWagePay', { ...this.wagePayQueryParams, + proName: this.proName, + month: this.month, }, '农民工工资支付表.xlsx', ) diff --git a/src/views/synthesize-query/three-and-one/month-detail/index.vue b/src/views/synthesize-query/three-and-one/month-detail/index.vue index 44619de..925e637 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/index.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/index.vue @@ -1,8 +1,13 @@ @@ -21,6 +26,7 @@ export default { month: null, proId: null, status: null, + proName: null, } }, created() { @@ -28,6 +34,7 @@ export default { this.month = this.$route.query?.month this.proId = this.$route.query?.proId this.status = this.$route.query?.status + this.proName = this.$route.query?.proName }, }