From 66bc37c7b134e10bb64830e56c3add71731fea33 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 20 二月 2025 16:55:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectEngineering/projectLibrary/list.js |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/list.js b/src/views/projectEngineering/projectLibrary/list.js
index 815a804..ff04631 100644
--- a/src/views/projectEngineering/projectLibrary/list.js
+++ b/src/views/projectEngineering/projectLibrary/list.js
@@ -1,15 +1,18 @@
 export const current = [
   {id: 'projectName', label: '椤圭洰鍚嶇О', visible: true},
-  {id: 'projectOwnerUnit', label: '涓氫富鍗曚綅', visible: true},
+  {id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true},
   {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: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
   {id: 'yearInvestAmount', label: '鏈勾璁″垝鎶曡祫', visible: true},
   {id: 'planStartTime', label: '椤圭洰骞翠唤', slotName: 'planStartTime', visible: true},
   {id: 'projectStatus', label: '椤圭洰鐘舵��', slotName: 'projectStatus', visible: true},
   {id: 'investType', label: '鎶曡祫绫诲埆', slotName: 'investType', visible: true},
+  {id: 'usedStatus', label: '浣跨敤鐘舵��', slotName: 'usedStatus', visible: true},
   {id: 'content', label: '寤鸿鍐呭', visible: false},
   {id: 'fundType', label: '璧勯噾绫诲瀷', visible: false},
   {id: 'projectContactPerson', label: '椤圭洰鑱旂郴浜�', visible: false},
@@ -22,10 +25,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},
@@ -88,16 +91,19 @@
 ];
 export const currentRest = [
   {id: 'projectName', label: '椤圭洰鍚嶇О', visible: true},
-  {id: 'projectOwnerUnit', label: '涓氫富鍗曚綅', visible: true},
+  {id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true},
   {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: 'totalInvestment', label: '鎬绘姇璧勯', visible: true},
   {id: 'yearInvestAmount', label: '鏈勾璁″垝鎶曡祫', visible: true},
   {id: 'planStartTime', label: '椤圭洰骞翠唤', slotName: 'planStartTime', visible: true},
   {id: 'projectStatus', label: '椤圭洰鐘舵��', slotName: 'projectStatus', visible: true},
   {id: 'investType', label: '鎶曡祫绫诲埆', slotName: 'investType', visible: true},
+  {id: 'usedStatus', label: '浣跨敤鐘舵��', slotName: 'usedStatus', visible: true},
   {id: 'content', label: '寤鸿鍐呭', visible: false},
   {id: 'fundType', label: '璧勯噾绫诲瀷', visible: false},
   {id: 'projectContactPerson', label: '椤圭洰鑱旂郴浜�', visible: false},
@@ -110,10 +116,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},
@@ -180,12 +186,13 @@
 // 娴佺▼鎺ㄨ繘鍒楄〃浣跨敤
 export const projectProcessCurrent = [
   {id: 'projectName', label: '椤圭洰鍚嶇О', visible: true},
-  {id: 'flowableProcessName', label: '缁戝畾娴佺▼', visible: true},
-  {id: 'projectOwnerUnit', label: '涓氫富鍗曚綅', visible: true},
+  {id: 'flowableProcessName', label: '缁戝畾娴佺▼', visible: true, minWidth: 200, showOverflowTooltip: true},
+  {id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true},
   {id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true},
   {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},
@@ -203,10 +210,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},
@@ -269,12 +276,13 @@
 ];
 export const projectProcessCurrentRest = [
   {id: 'projectName', label: '椤圭洰鍚嶇О', visible: true},
-  {id: 'flowableProcessName', label: '缁戝畾娴佺▼', visible: true},
-  {id: 'projectOwnerUnit', label: '涓氫富鍗曚綅', visible: true},
+  {id: 'flowableProcessName', label: '缁戝畾娴佺▼', visible: true, minWidth: 200, showOverflowTooltip: true},
+  {id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true},
   {id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true},
   {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},
@@ -292,10 +300,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