From 39b926f58718ba6e27d7ca27b9f0623ff78318e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 22 二月 2025 17:23:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectEngineering/projectLibrary/list.js |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/list.js b/src/views/projectEngineering/projectLibrary/list.js
index c5fb86e..ca6d80b 100644
--- a/src/views/projectEngineering/projectLibrary/list.js
+++ b/src/views/projectEngineering/projectLibrary/list.js
@@ -4,7 +4,10 @@
   {id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true},
   {id: 'projectCode', label: '椤圭洰浠ｇ爜', visible: true},
   {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true},
+  {id: 'projectSubType', label: '椤圭洰瀛愮被鍨�', visible: true},
   {id: 'projectPhase', label: '椤圭洰闃舵', visible: true},
+  {id: 'constructionNature', label: '寤鸿鎬ц川', slotName: 'constructionNature', visible: true},
+  {id: 'attractInvestment', label: '鎷涘晢寮曡祫椤圭洰', slotName: 'attractInvestment', visible: true},
   {id: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
   {id: 'yearInvestAmount', label: '鏈勾璁″垝鎶曡祫', visible: true},
   {id: 'planStartTime', label: '椤圭洰骞翠唤', slotName: 'planStartTime', visible: true},
@@ -23,10 +26,10 @@
   {id: 'importanceType', label: '閲嶇偣鍒嗙被', slotName: 'importanceType', visible: false},
   {id: 'setTime', label: '绔嬮」鏃堕棿', visible: false},
   {id: 'planCompleteTime', label: '璁″垝绔ｅ伐鏃堕棿', visible: false},
-  {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
-  {id: 'winAmount', label: '涓爣閲戦', visible: false},
-  {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
-  {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
+  // {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
+  // {id: 'winAmount', label: '涓爣閲戦', visible: false},
+  // {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
+  // {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
   {id: 'address', label: '椤圭洰鍦板潃', visible: false},
   {id: 'projectBudget', label: '椤圭洰棰勭畻', visible: false},
   {id: 'beCrossRegion', label: '寤鸿鍦扮偣鏄惁璺ㄥ煙', visible: false},
@@ -93,7 +96,10 @@
   {id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true},
   {id: 'projectCode', label: '椤圭洰浠ｇ爜', visible: true},
   {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true},
+  {id: 'projectSubType', label: '椤圭洰瀛愮被鍨�', visible: true},
   {id: 'projectPhase', label: '椤圭洰闃舵', visible: true},
+  {id: 'constructionNature', label: '寤鸿鎬ц川', slotName: 'constructionNature', visible: true},
+  {id: 'attractInvestment', label: '鎷涘晢寮曡祫椤圭洰', slotName: 'attractInvestment', visible: true},
   {id: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
   {id: 'yearInvestAmount', label: '鏈勾璁″垝鎶曡祫', visible: true},
   {id: 'planStartTime', label: '椤圭洰骞翠唤', slotName: 'planStartTime', visible: true},
@@ -112,10 +118,10 @@
   {id: 'importanceType', label: '閲嶇偣鍒嗙被', slotName: 'importanceType', visible: false},
   {id: 'setTime', label: '绔嬮」鏃堕棿', visible: false},
   {id: 'planCompleteTime', label: '璁″垝绔ｅ伐鏃堕棿', visible: false},
-  {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
-  {id: 'winAmount', label: '涓爣閲戦', visible: false},
-  {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
-  {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
+  // {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
+  // {id: 'winAmount', label: '涓爣閲戦', visible: false},
+  // {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
+  // {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
   {id: 'address', label: '椤圭洰鍦板潃', visible: false},
   {id: 'projectBudget', label: '椤圭洰棰勭畻', visible: false},
   {id: 'beCrossRegion', label: '寤鸿鍦扮偣鏄惁璺ㄥ煙', visible: false},
@@ -188,6 +194,7 @@
   {id: 'projectCode', label: '椤圭洰浠ｇ爜', visible: true},
   {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true},
   {id: 'projectPhase', label: '椤圭洰闃舵', visible: true},
+  {id: 'constructionNature', label: '寤鸿鎬ц川', slotName: 'constructionNature', visible: true},
   {id: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
   {id: 'yearInvestAmount', label: '鏈勾璁″垝鎶曡祫', visible: true},
   {id: 'planStartTime', label: '椤圭洰骞翠唤', slotName: 'planStartTime', visible: true},
@@ -205,10 +212,10 @@
   {id: 'importanceType', label: '閲嶇偣鍒嗙被', slotName: 'importanceType', visible: false},
   {id: 'setTime', label: '绔嬮」鏃堕棿', visible: false},
   {id: 'planCompleteTime', label: '璁″垝绔ｅ伐鏃堕棿', visible: false},
-  {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
-  {id: 'winAmount', label: '涓爣閲戦', visible: false},
-  {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
-  {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
+  // {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
+  // {id: 'winAmount', label: '涓爣閲戦', visible: false},
+  // {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
+  // {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
   {id: 'address', label: '椤圭洰鍦板潃', visible: false},
   {id: 'projectBudget', label: '椤圭洰棰勭畻', visible: false},
   {id: 'beCrossRegion', label: '寤鸿鍦扮偣鏄惁璺ㄥ煙', visible: false},
@@ -277,6 +284,7 @@
   {id: 'projectCode', label: '椤圭洰浠ｇ爜', visible: true},
   {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true},
   {id: 'projectPhase', label: '椤圭洰闃舵', visible: true},
+  {id: 'constructionNature', label: '寤鸿鎬ц川', slotName: 'constructionNature', visible: true},
   {id: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
   {id: 'yearInvestAmount', label: '鏈勾璁″垝鎶曡祫', visible: true},
   {id: 'planStartTime', label: '椤圭洰骞翠唤', slotName: 'planStartTime', visible: true},
@@ -294,10 +302,10 @@
   {id: 'importanceType', label: '閲嶇偣鍒嗙被', slotName: 'importanceType', visible: false},
   {id: 'setTime', label: '绔嬮」鏃堕棿', visible: false},
   {id: 'planCompleteTime', label: '璁″垝绔ｅ伐鏃堕棿', visible: false},
-  {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
-  {id: 'winAmount', label: '涓爣閲戦', visible: false},
-  {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
-  {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
+  // {id: 'winUnit', label: '涓爣鍗曚綅', visible: false},
+  // {id: 'winAmount', label: '涓爣閲戦', visible: false},
+  // {id: 'winTime', label: '涓爣鏃堕棿', visible: false},
+  // {id: 'year', label: '骞村害鎶曡祫璁″垝', visible: false},
   {id: 'address', label: '椤圭洰鍦板潃', visible: false},
   {id: 'projectBudget', label: '椤圭洰棰勭畻', visible: false},
   {id: 'beCrossRegion', label: '寤鸿鍦扮偣鏄惁璺ㄥ煙', visible: false},

--
Gitblit v1.8.0