diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index 40b31fb..3400dc4 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -864,9 +864,9 @@ export default { customFn: (row) => { { return row.money_way_detail.map(item => { - return (< div> { + return (
{ item.value - } < /div>) + }
) }) } @@ -879,11 +879,11 @@ export default { customFn: (row) => { { return row.plans.map(item => { - return (< div> [{ + return (
[{ item.year - }] - { + }]-{ item.name - } < /div>) + }
) }) } @@ -912,12 +912,11 @@ export default { width: 140, customFn: (row) => { let per = ((((row.fund_log_total) / row.money) || 0) * 100)?.toFixed(2) || 0 - return (< - div style={ + return (
110 ? 'red' : 'green' } - }> { + }>{ per } %
diff --git a/src/views/statisticalReport/govProcure.vue b/src/views/statisticalReport/govProcure.vue index bbebdf2..a88c63c 100644 --- a/src/views/statisticalReport/govProcure.vue +++ b/src/views/statisticalReport/govProcure.vue @@ -141,14 +141,29 @@ export default { label: "年份", width: 100, align: "center", + fixed:'left' }, { prop: "name", label: "项目名称", width: 180, align: "left", + fixed:'left' + }, + { + label: '完成情况', + width: 160, + fixed:'left', + customFn:row => { + return ( +
+ { row.public_act_date ? (采购意向公开已完成) : (采购意向公开未完成) } + { row.invite_act_date ? 招标文件挂网已完成 : (招标文件挂网未完成) } + { row.open_act_date ? 项目开标已完成 : (项目开标未完成) } +
+ ) + } }, - { prop: "is_face_small", label: "是否面向专门面向中小企业采购", @@ -169,20 +184,6 @@ export default { : "否"; }, }, - { - label: '完成情况', - width: 160, - customFn:row => { - return ( -
- { row.public_act_date ? '' : (采购意向公开未完成) } - { row.invite_act_date ? '' : (招标文件挂网未完成) } - { row.open_act_date ? '' : (项目开标未完成) } - { (row.public_act_date && row.invite_act_date && row.open_act_date) ? (已完成) : '' } -
- ) - } - }, { prop: "public_plane_date", label: "采购意向公开计划时间",