From 4286c208013a12a6c3c109da91f0135a7f9dd381 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 28 Apr 2025 17:10:03 +0800
Subject: [PATCH] pull

---
 src/views/contract/contractList.vue        | 15 +++++------
 src/views/statisticalReport/govProcure.vue | 31 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

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 (<div> {
                   item.value
-                } < /div>)
+                } </div>)
               })
             }
 
@@ -879,11 +879,11 @@ export default {
           customFn: (row) => {
             {
               return row.plans.map(item => {
-                return (< div> [{
+                return (<div> [{
                   item.year
-                }] - {
+                }]-{
                   item.name
-                } < /div>)
+                } </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 (<div style={
                 {
                   'color': per > 110 ? 'red' : 'green'
                 }
-              }> {
+              }>{
                 per
               } %
               </div>
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 (
+              <div>
+                { row.public_act_date ? (<Tag color="success">采购意向公开已完成</Tag>) : (<Tag color="warning">采购意向公开未完成</Tag>) }
+                { row.invite_act_date ? <Tag color="success">招标文件挂网已完成</Tag> : (<Tag color="warning">招标文件挂网未完成</Tag>) }
+                { row.open_act_date ? <Tag color="success">项目开标已完成</Tag> : (<Tag color="warning">项目开标未完成</Tag>) }
+              </div>
+            )
+          }
         },
-
         {
           prop: "is_face_small",
           label: "是否面向专门面向中小企业采购",
@@ -169,20 +184,6 @@ export default {
              : "否";
           },
         },
-        {
-          label: '完成情况',
-          width: 160,
-          customFn:row => {
-            return (
-              <div>
-                { row.public_act_date ? '' : (<Tag color="warning">采购意向公开未完成</Tag>) }
-                { row.invite_act_date ? '' : (<Tag color="warning">招标文件挂网未完成</Tag>) }
-                { row.open_act_date ? '' : (<Tag color="warning">项目开标未完成</Tag>) }
-                { (row.public_act_date && row.invite_act_date && row.open_act_date) ? (<Tag color="success">已完成</Tag>) : '' }
-              </div>
-            )
-          }
-        },
         {
           prop: "public_plane_date",
           label: "采购意向公开计划时间",