diff --git a/src/views/finance/components/addPropertyPlan.vue b/src/views/finance/components/addPropertyPlan.vue index 12b5d97..6a0fed8 100644 --- a/src/views/finance/components/addPropertyPlan.vue +++ b/src/views/finance/components/addPropertyPlan.vue @@ -85,7 +85,7 @@ content: '', plan_date: '', actually_date: '', - report_date: '' + date: '' }) " >新增 @@ -516,7 +515,7 @@ export default { content: i.content || '', plan_date: i.plan_date || '', actually_date: i.actually_date || '', - report_date: i.report_date || '' + date: i.date || '' }; }); }, diff --git a/src/views/finance/financialEvaluation.vue b/src/views/finance/financialEvaluation.vue index 966a410..aa66dad 100644 --- a/src/views/finance/financialEvaluation.vue +++ b/src/views/finance/financialEvaluation.vue @@ -240,7 +240,7 @@ export default { }, }, { - prop: 'report_date', + prop: 'date', label: '出具报告时间', width: 170, formatter: (cell, data, value) => { diff --git a/src/views/statisticalReport/govProcure.vue b/src/views/statisticalReport/govProcure.vue index 1b30ef4..4f678a8 100644 --- a/src/views/statisticalReport/govProcure.vue +++ b/src/views/statisticalReport/govProcure.vue @@ -134,7 +134,7 @@ export default { align: "left", }, { - label: '未完成情况', + label: '完成情况', width: 160, customFn:row => { return ( @@ -142,6 +142,7 @@ export default { { row.public_act_date ? '' : (采购意向公开未完成) } { row.invite_act_date ? '' : (招标文件挂网未完成) } { row.open_act_date ? '' : (项目开标未完成) } + { (row.public_act_date && row.invite_act_date && row.open_act_date) ? (已完成) : '' } ) }