From bccef675db16bc09fbb5314396a1000c14b32b80 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 12 二月 2025 15:58:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/projectEngineering/projectLibrary/list.js | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/projectEngineering/projectLibrary/list.js b/src/views/projectEngineering/projectLibrary/list.js index bbc8e98..e152784 100644 --- a/src/views/projectEngineering/projectLibrary/list.js +++ b/src/views/projectEngineering/projectLibrary/list.js @@ -1,6 +1,6 @@ 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: '椤圭洰浠g爜', visible: true}, {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true}, @@ -10,6 +10,7 @@ {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}, @@ -88,7 +89,7 @@ ]; 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: '椤圭洰浠g爜', visible: true}, {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true}, @@ -181,7 +182,7 @@ export const projectProcessCurrent = [ {id: 'projectName', label: '椤圭洰鍚嶇О', visible: true}, {id: 'flowableProcessName', label: '缁戝畾娴佺▼', visible: true, minWidth: 200, showOverflowTooltip: true}, - {id: 'projectOwnerUnit', label: '涓氫富鍗曚綅', visible: true}, + {id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true}, {id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true}, {id: 'projectCode', label: '椤圭洰浠g爜', visible: true}, {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true}, @@ -270,7 +271,7 @@ export const projectProcessCurrentRest = [ {id: 'projectName', label: '椤圭洰鍚嶇О', visible: true}, {id: 'flowableProcessName', label: '缁戝畾娴佺▼', visible: true, minWidth: 200, showOverflowTooltip: true}, - {id: 'projectOwnerUnit', label: '涓氫富鍗曚綅', visible: true}, + {id: 'projectOwnerUnitName', label: '涓氫富鍗曚綅', visible: true}, {id: 'coding', label: '椤圭洰鐮�', slotName: 'coding', visible: true}, {id: 'projectCode', label: '椤圭洰浠g爜', visible: true}, {id: 'projectType', label: '椤圭洰绫诲瀷', slotName: 'projectType', visible: true}, -- Gitblit v1.8.0