diff --git a/src/views/material/cost/component/reportHome.vue b/src/views/material/cost/component/reportHome.vue index 3a870f82..c30cecd7 100644 --- a/src/views/material/cost/component/reportHome.vue +++ b/src/views/material/cost/component/reportHome.vue @@ -43,6 +43,16 @@ style="width: 130px" /> + + + + + 查询 重置 @@ -130,7 +140,12 @@ - + + + @@ -401,6 +416,10 @@ export default { costDetailTitle: '', costDetailList: [], costDetailType: '', // 当前查看的费用类型 + proStatus:[ + { id: 0, name: '未竣工' }, + { id: 1, name: '已竣工' }, + ], } }, created() { @@ -929,7 +948,7 @@ export default { { key: 'loseCost', title: '丢失费用' }, { key: 'scrapCost', title: '报废费用' }, { key: 'costs', title: '合计费用(元)' }, - { key: 'proStatus', title: '工程状态' }, + { key: 'proStatus', title: '竣工状态' }, { key: 'actualEndDate', title: '竣工日期' } ]; @@ -981,7 +1000,7 @@ export default { { wch: 12 }, // 丢失费用 { wch: 12 }, // 报废费用 { wch: 15 }, // 合计费用 - { wch: 12 }, // 工程状态 + { wch: 12 }, // 竣工状态 { wch: 12 } // 竣工日期 ]; worksheet['!cols'] = columnWidths; diff --git a/src/views/material/stquery/deviceUsingRecord.vue b/src/views/material/stquery/deviceUsingRecord.vue index 93691b39..71f679d8 100644 --- a/src/views/material/stquery/deviceUsingRecord.vue +++ b/src/views/material/stquery/deviceUsingRecord.vue @@ -91,6 +91,16 @@ + + + + + - + + + 0){ @@ -310,6 +330,7 @@ export default { isSlt: this.queryParams.isSlt, startTime: this.queryParams.startTime, endTime: this.queryParams.endTime, + isFinish : this.queryParams.isFinish } const response = await getProjUsingRecordListNoPage(param) let obj = { @@ -390,7 +411,8 @@ export default { startTime: this.queryParams.startTime, endTime: this.queryParams.endTime, pageSize: this.queryParams.pageSize, - pageNum: this.queryParams.pageNum + pageNum: this.queryParams.pageNum, + isFinish : this.queryParams.isFinish } const currentTime = formatTime(new Date());