From 3114bfec4e2278bdd394eb9e74dd9506f42232b2 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:27 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化,补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联,支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入,支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典,完善操作日志及附件下载。
---
src/components/AttachmentUpload/image/index.vue | 1
src/views/collaborativeApproval/approvalProcess/index.vue | 2
src/views/financialManagement/voucher/index.vue | 1
src/views/salesManagement/salesLedger/index.vue | 377 ++++++++++++
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 8
src/views/collaborativeApproval/approvalManagement/index.vue | 4
src/views/collaborativeApproval/sealManagement/index.vue | 3
src/views/basicData/customerFile/index.vue | 325 ++++++++---
src/views/projectManagement/Management/components/formDia.vue | 84 --
src/components/Dialog/FileList.vue | 22
src/views/salesManagement/salesLedger/fileList.vue | 3
src/components/Dialog/FileListDialog.vue | 25
src/views/collaborativeApproval/shipmentReview/fileList.vue | 3
src/views/procurementManagement/procurementLedger/fileList.vue | 3
src/components/PIMTable/PIMTable.vue | 2
src/views/projectManagement/Management/components/ProjectExecutionPanel.vue | 420 ++++++++++---
sql/20261105_project_phase_history.sql | 16
src/api/projectManagement/workflow.js | 3
sql/20261103_project_workflow_upgrade.sql | 3
sql/20261105_system_data_cleanup.sql | 168 +++++
src/views/projectManagement/Management/projectDetail.vue | 32
src/components/AttachmentUpload/file/index.vue | 1
src/views/collaborativeApproval/approvalProcess/fileList.vue | 3
src/views/safeProduction/safeWorkApproval/fileList.vue | 3
src/components/FileUpload/index.vue | 22
src/views/projectManagement/Management/index.vue | 163 +++++
26 files changed, 1,317 insertions(+), 380 deletions(-)
diff --git a/sql/20261103_project_workflow_upgrade.sql b/sql/20261103_project_workflow_upgrade.sql
index 21452e0..e335040 100644
--- a/sql/20261103_project_workflow_upgrade.sql
+++ b/sql/20261103_project_workflow_upgrade.sql
@@ -27,9 +27,6 @@
CALL add_column_if_missing('project_management_info','project_leader_name',"varchar(100) DEFAULT NULL COMMENT '椤圭洰璐熻矗浜�'");
CALL add_column_if_missing('project_management_info','project_manager_ids',"json DEFAULT NULL COMMENT '椤圭洰缁忕悊ID鏁扮粍'");
CALL add_column_if_missing('project_management_info','project_manager_names',"json DEFAULT NULL COMMENT '椤圭洰缁忕悊鍚嶇О鏁扮粍'");
-CALL add_column_if_missing('project_management_info','project_executor_ids',"json DEFAULT NULL COMMENT '椤圭洰鎵ц浜篒D鏁扮粍'");
-CALL add_column_if_missing('project_management_info','project_executor_names',"json DEFAULT NULL COMMENT '椤圭洰鎵ц浜哄悕绉版暟缁�'");
-
-- 鏂扮増鐨勨�滅珛椤光�濇槸寮�濮嬪墠鐨勪俊鎭噯澶囨椿鍔紝寮�濮嬪悗缁熶竴杩涘叆鈥滃紑鍙戔�濋樁娈点��
UPDATE project_management_info SET current_phase = '寮�鍙�' WHERE current_phase = '绔嬮」' AND is_delete = 0;
CALL add_column_if_missing('project_management_info','follow_cycle',"varchar(20) DEFAULT 'MONTH' COMMENT 'MONTH姣忔湀 QUARTER姣忓搴� YEAR姣忓勾'");
diff --git a/sql/20261105_project_phase_history.sql b/sql/20261105_project_phase_history.sql
new file mode 100644
index 0000000..e1fa4dc
--- /dev/null
+++ b/sql/20261105_project_phase_history.sql
@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS `project_management_phase_history` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `project_id` bigint NOT NULL,
+ `phase_code` varchar(30) NOT NULL,
+ `phase_name` varchar(50) NOT NULL,
+ `action_type` varchar(30) NOT NULL,
+ `action_label` varchar(100) NOT NULL,
+ `form_data` json DEFAULT NULL,
+ `remark` varchar(2000) DEFAULT NULL,
+ `attachments` json DEFAULT NULL,
+ `operator_name` varchar(100) DEFAULT NULL,
+ `action_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`),
+ KEY `idx_phase_history_project` (`project_id`,`action_time`),
+ KEY `idx_phase_history_phase` (`project_id`,`phase_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='椤圭洰闃舵鍔炵悊鍘嗗彶';
diff --git a/sql/20261105_system_data_cleanup.sql b/sql/20261105_system_data_cleanup.sql
new file mode 100644
index 0000000..c6afe93
--- /dev/null
+++ b/sql/20261105_system_data_cleanup.sql
@@ -0,0 +1,168 @@
+-- 褰撳墠椤圭洰绯荤粺鍩虹鏁版嵁绮剧畝鑴氭湰
+-- 鎵ц鍓嶅浠斤細.local-backups/product-inventory-management-xmgl-before-system-cleanup-20261105-145021.sql
+-- 涓変釜璐﹀彿鍒濆瀵嗙爜缁熶竴涓猴細admin123锛堢櫥褰曞悗璇峰強鏃朵慨鏀规櫘閫氱敤鎴峰拰瀹㈡埛瀵嗙爜锛�
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+START TRANSACTION;
+
+-- 1. 鐢ㄦ埛銆佽鑹层�侀儴闂細浠呬繚鐣欑鐞嗗憳銆佹櫘閫氱敤鎴枫�佸鎴蜂笁绫昏处鍙枫��
+DELETE FROM sys_user_post;
+DELETE FROM sys_user_role;
+DELETE FROM sys_user_dept;
+DELETE FROM sys_role_menu;
+DELETE FROM sys_role_dept;
+DELETE FROM sys_user WHERE user_id <> 1;
+
+UPDATE sys_user
+SET user_name='admin', nick_name='绠$悊鍛樿处鍙�', user_type='00',
+ password='$2a$10$E0Rg.GqdeQd1ba2Z5P87HOsOELqoKwYwKFQGRGop.LEPaom7yzji.',
+ status='0', del_flag='0', tenant_id=208, update_by='system-cleanup', update_time=NOW(),
+ remark='绯荤粺绠$悊鍛�'
+WHERE user_id=1;
+
+INSERT INTO sys_user
+(user_id,user_name,nick_name,user_type,email,phonenumber,sex,password,status,del_flag,
+ create_by,create_time,remark,tenant_id,ai_enabled)
+VALUES
+(2,'user','鏅�氱敤鎴�','00','','','0','$2a$10$E0Rg.GqdeQd1ba2Z5P87HOsOELqoKwYwKFQGRGop.LEPaom7yzji.','0','0',
+ 'admin',NOW(),'椤圭洰鏃ュ父浣跨敤璐﹀彿',208,0),
+(3,'customer','瀹㈡埛璐﹀彿','01','','','0','$2a$10$E0Rg.GqdeQd1ba2Z5P87HOsOELqoKwYwKFQGRGop.LEPaom7yzji.','0','0',
+ 'admin',NOW(),'瀹㈡埛闂ㄦ埛璐﹀彿',208,0);
+
+DELETE FROM sys_role;
+INSERT INTO sys_role
+(role_id,role_name,role_key,role_sort,data_scope,menu_check_strictly,dept_check_strictly,status,del_flag,create_by,create_time,remark)
+VALUES
+(1,'绯荤粺绠$悊鍛�','admin',1,'1',1,1,'0','0','admin',NOW(),'鎷ユ湁鍏ㄩ儴绯荤粺鏉冮檺'),
+(2,'鏅�氱敤鎴�','common',2,'2',1,1,'0','0','admin',NOW(),'涓氬姟銆侀噰璐拰椤圭洰鏃ュ父鎿嶄綔'),
+(3,'瀹㈡埛瑙掕壊','customer',3,'5',1,1,'0','0','admin',NOW(),'浠呰闂鎴烽棬鎴�');
+
+DELETE FROM sys_dept;
+INSERT INTO sys_dept
+(dept_id,parent_id,ancestors,dept_name,order_num,leader,status,del_flag,create_by,create_time,dept_nick)
+VALUES
+(100,0,'0','宸ヤ綔瀹�',1,'绠$悊鍛樿处鍙�','0','0','admin',NOW(),'宸ヤ綔瀹�'),
+(101,100,'0,100','缁煎悎绠$悊閮�',1,'绠$悊鍛樿处鍙�','0','0','admin',NOW(),'缁煎悎'),
+(102,100,'0,100','椤圭洰閮�',2,'鏅�氱敤鎴�','0','0','admin',NOW(),'椤圭洰');
+
+INSERT INTO sys_user_role(user_id,role_id) VALUES (1,1),(2,2),(3,3);
+INSERT INTO sys_user_dept(user_id,dept_id,create_user,create_time)
+VALUES (1,100,1,NOW()),(2,102,1,NOW()),(3,100,1,NOW());
+INSERT INTO sys_role_dept(role_id,dept_id) VALUES (1,100),(1,101),(1,102),(2,102),(3,100);
+
+-- 宀椾綅鍦ㄥ綋鍓嶉」鐩祦绋嬩腑娌℃湁鐙珛涓氬姟浣滅敤锛氭竻绌哄矖浣嶅苟浠庤彍鍗曚腑绉婚櫎銆�
+DELETE FROM sys_post;
+
+-- 2. 鑿滃崟锛氬彧淇濈暀褰撳墠椤圭洰瀹為檯浣跨敤鐨勪笟鍔¤彍鍗曞拰绮剧畝鍚庣殑绯荤粺绠$悊銆�
+INSERT INTO sys_menu
+(menu_id,menu_name,parent_id,order_num,path,component,query,route_name,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time,remark)
+VALUES
+(2390,'閲囪喘瀹℃壒',2053,4,'purchaseApproval','collaborativeApproval/approvalProcess/index5',NULL,'PurchaseApproval',1,0,'C','0','0','approval:purchase:list','clipboard','admin',NOW(),'鎸夊鎵规祦绋嬮厤缃�愮骇瀹℃壒閲囪喘鍗�')
+ON DUPLICATE KEY UPDATE menu_name=VALUES(menu_name),parent_id=VALUES(parent_id),order_num=VALUES(order_num),
+ path=VALUES(path),component=VALUES(component),route_name=VALUES(route_name),visible='0',status='0',perms=VALUES(perms),icon=VALUES(icon);
+
+DELETE FROM sys_menu
+WHERE menu_id NOT IN (
+ 1,100,101,102,103,105,108,500,501,
+ 1000,1001,1002,1003,1004,1005,1006,
+ 1007,1008,1009,1010,1011,
+ 1012,1013,1014,1015,
+ 1016,1017,1018,1019,
+ 1025,1026,1027,1028,1029,
+ 1039,1040,1041,1042,1043,1044,1045,
+ 2053,2370,2371,2293,2390,
+ 2010,2001,2362,2363,2364,2365,2366,2367,2368,
+ 2372,2011,2360,2361,
+ 2015,2016,
+ 2276,2285,2373,2376,2377,2378,2379,2380,2381,2382,2383,2384,2385,2388,
+ 2374,2375,2386,2387,
+ 2357,2358,2359
+);
+
+UPDATE sys_menu SET visible='0',status='0';
+UPDATE sys_menu SET order_num=1 WHERE menu_id=2053;
+UPDATE sys_menu SET order_num=2 WHERE menu_id=2010;
+UPDATE sys_menu SET order_num=3 WHERE menu_id=2372;
+UPDATE sys_menu SET order_num=4 WHERE menu_id=2015;
+UPDATE sys_menu SET order_num=5 WHERE menu_id=2276;
+UPDATE sys_menu SET order_num=6 WHERE menu_id=2374;
+UPDATE sys_menu SET order_num=7 WHERE menu_id=1;
+UPDATE sys_menu SET order_num=8 WHERE menu_id=2357;
+UPDATE sys_menu SET menu_name='瀹℃壒娴佺▼閰嶇疆' WHERE menu_id=2293;
+UPDATE sys_menu SET menu_name='閲囪喘绠$悊' WHERE menu_id=2015;
+UPDATE sys_menu SET menu_name='閲囪喘鍙拌处' WHERE menu_id=2016;
+UPDATE sys_menu SET menu_name='椤圭洰鍒楄〃' WHERE menu_id=2285;
+
+-- 绠$悊鍛樻嫢鏈夊叏閮ㄤ繚鐣欒彍鍗曘��
+INSERT INTO sys_role_menu(role_id,menu_id) SELECT 1,menu_id FROM sys_menu;
+
+-- 鏅�氱敤鎴凤細琛屾斂鐢宠/瀹℃壒銆佸鎴枫�佷笟鍔°�侀噰璐�侀」鐩�佹斂绛栨枃浠躲��
+INSERT INTO sys_role_menu(role_id,menu_id)
+SELECT 2,menu_id FROM sys_menu WHERE menu_id IN (
+ 2053,2370,2371,2390,
+ 2010,2001,2367,2368,
+ 2372,2011,2360,2361,
+ 2015,2016,
+ 2276,2285,2373,2376,2377,2378,2379,2380,2381,2382,2383,2384,2385,2388,
+ 2374,2375,2386,2387
+);
+
+-- 瀹㈡埛瑙掕壊锛氬彧寮�鏀惧鎴疯祫鏂欏叆鍙c��
+INSERT INTO sys_role_menu(role_id,menu_id)
+SELECT 3,menu_id FROM sys_menu WHERE menu_id IN (2357,2358,2359);
+
+-- 3. 瀛楀吀锛氬垹闄ゆ棤鍏冲埗閫犱笟鍘嗗彶瀛楀吀锛屼繚鐣欑郴缁熷瓧鍏稿苟澧炲姞褰撳墠椤圭洰閫夋嫨椤广��
+DELETE FROM sys_dict_data;
+DELETE FROM sys_dict_type;
+
+INSERT INTO sys_dict_type(dict_id,dict_name,dict_type,status,create_by,create_time,remark) VALUES
+(1,'鐢ㄦ埛鎬у埆','sys_user_sex','0','admin',NOW(),'绯荤粺瀛楀吀'),
+(2,'鑿滃崟鏄剧ず鐘舵��','sys_show_hide','0','admin',NOW(),'绯荤粺瀛楀吀'),
+(3,'绯荤粺鍚敤鐘舵��','sys_normal_disable','0','admin',NOW(),'绯荤粺瀛楀吀'),
+(4,'鏄惁閫夐」','sys_yes_no','0','admin',NOW(),'绯荤粺瀛楀吀'),
+(5,'鎿嶄綔绫诲瀷','sys_oper_type','0','admin',NOW(),'鏃ュ織瀛楀吀'),
+(6,'閫氱敤鐘舵��','sys_common_status','0','admin',NOW(),'绯荤粺瀛楀吀'),
+(7,'绋庣巼','tax_rate','0','admin',NOW(),'涓氬姟閲囪喘閫氱敤'),
+(8,'椤圭洰鏉ユ簮','project_source','0','admin',NOW(),'椤圭洰绠$悊'),
+(9,'椤圭洰闃舵','project_phase','0','admin',NOW(),'椤圭洰绠$悊'),
+(10,'椤圭洰璺熻繘鍛ㄦ湡','project_follow_cycle','0','admin',NOW(),'椤圭洰绠$悊'),
+(11,'椤圭洰璧勬枡绫诲瀷','project_material_type','0','admin',NOW(),'椤圭洰绠$悊'),
+(12,'閫氱敤瀹℃壒鐘舵��','approval_status','0','admin',NOW(),'閲囪喘鍙婂崗鍚屽鎵�'),
+(13,'涓氬姟瀹℃壒鐘舵��','business_approval_status','0','admin',NOW(),'涓氬姟绠$悊'),
+(14,'璐㈠姟鎶ヨ〃瀹℃壒鐘舵��','financial_report_status','0','admin',NOW(),'瀹㈡埛绠$悊'),
+(15,'瀹㈡埛绛夌骇','customer_level','0','admin',NOW(),'瀹㈡埛绠$悊'),
+(16,'鏀跨瓥绾у埆','policy_level','0','admin',NOW(),'鏀垮簻鏀跨瓥鏂囦欢');
+
+INSERT INTO sys_dict_data
+(dict_sort,dict_label,dict_value,dict_type,css_class,list_class,is_default,status,create_by,create_time,remark)
+VALUES
+(1,'鐢�','0','sys_user_sex','','','N','0','admin',NOW(),''),(2,'濂�','1','sys_user_sex','','','N','0','admin',NOW(),''),(3,'鏈煡','2','sys_user_sex','','info','Y','0','admin',NOW(),''),
+(1,'鏄剧ず','0','sys_show_hide','','primary','Y','0','admin',NOW(),''),(2,'闅愯棌','1','sys_show_hide','','info','N','0','admin',NOW(),''),
+(1,'姝e父','0','sys_normal_disable','','success','Y','0','admin',NOW(),''),(2,'鍋滅敤','1','sys_normal_disable','','danger','N','0','admin',NOW(),''),
+(1,'鏄�','Y','sys_yes_no','','success','N','0','admin',NOW(),''),(2,'鍚�','N','sys_yes_no','','info','Y','0','admin',NOW(),''),
+(0,'鍏朵粬','0','sys_oper_type','','info','N','0','admin',NOW(),''),(1,'鏂板','1','sys_oper_type','','success','N','0','admin',NOW(),''),(2,'淇敼','2','sys_oper_type','','primary','N','0','admin',NOW(),''),(3,'鍒犻櫎','3','sys_oper_type','','danger','N','0','admin',NOW(),''),(5,'瀵煎嚭','5','sys_oper_type','','warning','N','0','admin',NOW(),''),(6,'瀵煎叆','6','sys_oper_type','','warning','N','0','admin',NOW(),''),
+(1,'姝e父','0','sys_common_status','','success','Y','0','admin',NOW(),''),(2,'鍋滅敤','1','sys_common_status','','danger','N','0','admin',NOW(),''),
+(1,'0%','0','tax_rate','','info','N','0','admin',NOW(),''),(2,'1%','1','tax_rate','','','N','0','admin',NOW(),''),(3,'3%','3','tax_rate','','','N','0','admin',NOW(),''),(4,'6%','6','tax_rate','','','N','0','admin',NOW(),''),(5,'9%','9','tax_rate','','','N','0','admin',NOW(),''),(6,'13%','13','tax_rate','','primary','Y','0','admin',NOW(),''),
+(1,'鎵嬪姩鍒涘缓','MANUAL','project_source','','primary','Y','0','admin',NOW(),''),(2,'涓氬姟鐢熸垚','BUSINESS','project_source','','success','N','0','admin',NOW(),''),
+(1,'鏈紑濮�','鏈紑濮�','project_phase','','info','Y','0','admin',NOW(),''),(2,'绔嬮」','绔嬮」','project_phase','','warning','N','0','admin',NOW(),''),(3,'寮�鍙�','寮�鍙�','project_phase','','primary','N','0','admin',NOW(),''),(4,'鐢虫姤','鐢虫姤','project_phase','','warning','N','0','admin',NOW(),''),(5,'鐢虫姤缁撴灉','鐢虫姤缁撴灉','project_phase','','success','N','0','admin',NOW(),''),(6,'楠屾敹','楠屾敹','project_phase','','success','N','0','admin',NOW(),''),(7,'宸插畬鎴�','宸插畬鎴�','project_phase','','success','N','0','admin',NOW(),''),
+(1,'姣忔湀','MONTHLY','project_follow_cycle','','','Y','0','admin',NOW(),''),(2,'姣忓搴�','QUARTERLY','project_follow_cycle','','','N','0','admin',NOW(),''),(3,'姣忓勾','YEARLY','project_follow_cycle','','','N','0','admin',NOW(),''),
+(1,'绔嬮」璧勬枡','INITIATION','project_material_type','','','N','0','admin',NOW(),''),(2,'寮�鍙戣祫鏂�','DEVELOPMENT','project_material_type','','','N','0','admin',NOW(),''),(3,'鐢虫姤璧勬枡','APPLICATION','project_material_type','','','N','0','admin',NOW(),''),(4,'楠屾敹璧勬枡','ACCEPTANCE','project_material_type','','','N','0','admin',NOW(),''),(5,'鍏朵粬','OTHER','project_material_type','','info','Y','0','admin',NOW(),''),
+(0,'鑽夌','0','approval_status','','info','Y','0','admin',NOW(),''),(1,'寰呭鎵�','1','approval_status','','warning','N','0','admin',NOW(),''),(2,'瀹℃壒涓�','2','approval_status','','primary','N','0','admin',NOW(),''),(3,'宸查�氳繃','3','approval_status','','success','N','0','admin',NOW(),''),(4,'宸查┏鍥�','4','approval_status','','danger','N','0','admin',NOW(),''),
+(0,'鑽夌','0','business_approval_status','','info','Y','0','admin',NOW(),''),(1,'寰呭鎵�','1','business_approval_status','','warning','N','0','admin',NOW(),''),(2,'宸查�氳繃','2','business_approval_status','','success','N','0','admin',NOW(),''),(3,'宸查��鍥�','3','business_approval_status','','danger','N','0','admin',NOW(),''),
+(0,'寰呭鎵�','0','financial_report_status','','warning','Y','0','admin',NOW(),''),(1,'宸查�氳繃','1','financial_report_status','','success','N','0','admin',NOW(),''),(2,'宸查��鍥�','2','financial_report_status','','danger','N','0','admin',NOW(),''),
+(1,'閲嶇偣瀹㈡埛','A','customer_level','','danger','N','0','admin',NOW(),''),(2,'鏅�氬鎴�','B','customer_level','','primary','Y','0','admin',NOW(),''),(3,'娼滃湪瀹㈡埛','C','customer_level','','info','N','0','admin',NOW(),''),
+(1,'鍥藉绾�','NATIONAL','policy_level','','danger','N','0','admin',NOW(),''),(2,'鐪佺骇','PROVINCE','policy_level','','warning','N','0','admin',NOW(),''),(3,'甯傜骇','CITY','policy_level','','primary','Y','0','admin',NOW(),''),(4,'鍖哄幙绾�','DISTRICT','policy_level','','info','N','0','admin',NOW(),'');
+
+-- 閲囪喘瀹℃壒榛樿閰嶇疆绠$悊鍛樹负绗竴绾у鎵逛汉锛屽悗缁彲鍦ㄢ�滃鎵规祦绋嬮厤缃�濅腑璋冩暣銆�
+DELETE FROM approve_process_config_node WHERE approve_type=5;
+INSERT INTO approve_process_config_node
+(approve_type,node_order,approver_id,approver_name,timeout_hours,tenant_id,create_user,create_time,delete_flag,dept_id)
+VALUES (5,1,1,'绠$悊鍛樿处鍙�',24,208,1,NOW(),0,100);
+
+-- 4. 鏃ュ織浠庡綋鍓嶉」鐩寮忕増鏈噸鏂板紑濮嬭褰曘��
+DELETE FROM sys_oper_log;
+DELETE FROM sys_logininfor;
+
+COMMIT;
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/src/api/projectManagement/workflow.js b/src/api/projectManagement/workflow.js
index de8ad82..7a87f28 100644
--- a/src/api/projectManagement/workflow.js
+++ b/src/api/projectManagement/workflow.js
@@ -4,11 +4,12 @@
url: `/projectManagement/workflow/${projectId}`,
method: 'get'
})
+export const getProjectLifecycle = projectId => request({ url: `/projectManagement/workflow/lifecycle/${projectId}`, method: 'get' })
export const startProjectWorkflow = projectId => request({ url: `/projectManagement/workflow/start/${projectId}`, method: 'post' })
-export const updateProjectExecutors = data => request({ url: '/projectManagement/workflow/project-executors', method: 'post', data })
export const transitionProjectStage = data => request({ url: '/projectManagement/workflow/transition', method: 'post', data })
export const saveProjectModule = data => request({ url: '/projectManagement/workflow/module', method: 'post', data })
+export const saveProjectModulesBatch = data => request({ url: '/projectManagement/workflow/modules/batch', method: 'post', data })
export const deleteProjectModule = id => request({ url: `/projectManagement/workflow/module/${id}`, method: 'delete' })
export const saveProjectFollowUp = data => request({ url: '/projectManagement/workflow/follow-up', method: 'post', data })
export const deleteProjectFollowUp = id => request({ url: `/projectManagement/workflow/follow-up/${id}`, method: 'delete' })
diff --git a/src/components/AttachmentUpload/file/index.vue b/src/components/AttachmentUpload/file/index.vue
index 1e4508c..a1a6b9f 100644
--- a/src/components/AttachmentUpload/file/index.vue
+++ b/src/components/AttachmentUpload/file/index.vue
@@ -280,7 +280,6 @@
:on-change="handleChange"
:on-remove="handleRemove"
:on-exceed="handleExceed"
- :on-preview="openFile"
>
<el-icon class="upload-drag-icon"><UploadFilled /></el-icon>
<div class="el-upload__text">
diff --git a/src/components/AttachmentUpload/image/index.vue b/src/components/AttachmentUpload/image/index.vue
index 8243f9c..233acfd 100644
--- a/src/components/AttachmentUpload/image/index.vue
+++ b/src/components/AttachmentUpload/image/index.vue
@@ -270,7 +270,6 @@
:limit="limit"
:on-change="handleChange"
:on-remove="handleRemove"
- :on-preview="handlePreview"
:on-exceed="handleExceed"
>
<div class="upload-trigger">
diff --git a/src/components/Dialog/FileList.vue b/src/components/Dialog/FileList.vue
index b0e78cf..343fc05 100644
--- a/src/components/Dialog/FileList.vue
+++ b/src/components/Dialog/FileList.vue
@@ -43,13 +43,6 @@
type="primary"
size="small"
class="download-link"
- @click="previewFile(scope.row.previewURL)">
- 棰勮
- </el-button>
- <el-button link
- type="primary"
- size="small"
- class="download-link"
@click="downloadFile(scope.row.downloadURL)">
涓嬭浇
</el-button>
@@ -65,11 +58,9 @@
</el-table>
</div>
</el-dialog>
- <filePreview ref="filePreviewRef" />
</template>
<script setup>
-import { ElMessage } from 'element-plus'
import { ref, computed, getCurrentInstance, onMounted, watch } from "vue";
import AttachmentUpload from "@/components/AttachmentUpload/file/index.vue";
import {
@@ -77,8 +68,6 @@
deleteAttachment,
createAttachment,
} from "@/api/basicData/storageAttachment.js";
- import filePreview from '@/components/filePreview/index.vue'
- const filePreviewRef = ref()
const props = defineProps({
visible: {
@@ -132,15 +121,6 @@
const handleClose = () => {
isShow.value = false;
};
-
- // 棰勮鏂囦欢
- const previewFile = (url) => {
- if (url) {
- filePreviewRef.value.open(url)
- } else {
- ElMessage.warning('鏂囦欢鍦板潃鏃犳晥锛屾棤娉曢瑙�')
- }
- }
const handleUpload = () => {
uploadDialogVisible.value = true;
@@ -260,4 +240,4 @@
:deep(.el-table__empty-text) {
color: #999;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/Dialog/FileListDialog.vue b/src/components/Dialog/FileListDialog.vue
index 6fea795..bfd154d 100644
--- a/src/components/Dialog/FileListDialog.vue
+++ b/src/components/Dialog/FileListDialog.vue
@@ -49,13 +49,6 @@
@click="handleDownload(scope.row)">
涓嬭浇
</el-button>
- <el-button v-if="showPreview"
- link
- type="primary"
- size="small"
- @click="handlePreview(scope.row)">
- 棰勮
- </el-button>
<el-button v-if="showDeleteButton"
link
type="danger"
@@ -77,16 +70,12 @@
@pagination="paginationSearch"
@change="handleChange" />
</el-dialog>
-<!-- // todo 闄勪欢棰勮鐩稿叧 -->
- <filePreview v-if="showPreview"
- ref="filePreviewRef" />
</template>
<script setup>
import { ref, computed, getCurrentInstance } from "vue";
import pagination from "@/components/Pagination/index.vue";
import { ElMessage } from "element-plus";
- import filePreview from "@/components/filePreview/index.vue";
import { getToken } from "@/utils/auth";
const props = defineProps({
@@ -132,7 +121,7 @@
},
showPreview: {
type: Boolean,
- default: true,
+ default: false,
},
showUploadButton: {
type: Boolean,
@@ -194,7 +183,6 @@
]);
const { proxy } = getCurrentInstance();
- const filePreviewRef = ref(null);
const uploadFileList = ref([]);
const dialogVisible = computed({
@@ -225,17 +213,6 @@
emit("download", row);
};
- const handlePreview = row => {
- if (props.previewMethod) {
- props.previewMethod(row);
- } else {
- // 榛樿棰勮鏂规硶
- if (filePreviewRef.value) {
- filePreviewRef.value.open(row[props.urlField]);
- }
- }
- emit("preview", row);
- };
const paginationSearch = page => {
props.page.current = page.page;
props.page.size = page.limit;
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 242b485..229cd7c 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -20,11 +20,10 @@
<!-- 鏂囦欢鍒楄〃 -->
<transition-group ref="uploadListRef" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
- <el-link :href="getFileUrl(file.url)" :underline="false" target="_blank">
- <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
- </el-link>
- <div class="ele-upload-list__item-content-action">
- <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled"> 鍒犻櫎</el-link>
+ <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+ <div class="ele-upload-list__item-content-action">
+ <el-link :underline="false" @click="downloadFile(file)" type="primary"> 涓嬭浇</el-link>
+ <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled"> 鍒犻櫎</el-link>
</div>
</li>
</transition-group>
@@ -87,9 +86,18 @@
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
const headers = ref({ Authorization: "Bearer " + getToken() });
const fileList = ref([]);
-const showTip = computed(
+const showTip = computed(
() => props.isShowTip && (props.fileType || props.fileSize)
-);
+);
+
+const downloadFile = file => {
+ const url = file?.url || "";
+ if (!url) {
+ proxy.$modal.msgWarning("鏂囦欢鍦板潃鏃犳晥");
+ return;
+ }
+ proxy.$download.resource(url);
+};
watch(
() => props.modelValue,
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 7940f1a..e692431 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -116,7 +116,7 @@
<!-- 鎸夐挳 -->
<div v-else-if="item.dataType == 'action'"
@click.stop>
- <template v-for="(o, key) in item.operation"
+ <template v-for="(o, key) in item.operation.filter(operation => operation.name !== '棰勮')"
:key="key">
<el-button v-show="o.type != 'upload'"
v-if="o.showHide ? o.showHide(scope.row) : true"
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 1c4e6e8..cd2ae30 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -263,92 +263,107 @@
</template>
</el-dialog>
<!-- 杩�3骞磋储鍔℃姤琛ㄤ笂浼� -->
- <el-dialog title="杩�3骞磋储鍔℃姤琛ㄤ笂浼�"
+ <el-dialog title="杩�3骞磋储鍔℃姤琛�"
v-model="reportDialogVisible"
- width="900px"
+ width="980px"
@close="closeReportDialog">
- <div class="report-customer">瀹㈡埛锛歿{ reportCustomer.customerName }}</div>
- <el-form :model="reportForm"
- label-width="90px"
- inline
- class="report-form">
- <el-form-item label="鎶ヨ〃骞村害">
- <el-select v-model="reportForm.reportYear"
- placeholder="璇烽�夋嫨骞村害"
- style="width: 150px">
- <el-option v-for="year in reportYears"
- :key="year"
- :label="year + '骞�'"
- :value="year" />
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ヨ〃鍚嶇О">
- <el-input v-model="reportForm.reportName"
- placeholder="渚嬪锛�2025骞村害璐㈠姟鎶ヨ〃"
- style="width: 260px"
- clearable />
- </el-form-item>
- </el-form>
- <FileUpload v-model="reportForm.reportFiles"
- :limit="5"
- :file-size="20"
- :file-type="['pdf', 'doc', 'docx', 'xls', 'xlsx', 'jpg', 'png', 'zip', 'rar']" />
- <div class="report-actions">
- <el-button type="primary"
- :loading="reportSaving"
- @click="saveReport">淇濆瓨涓婁紶</el-button>
- <el-button @click="resetReportForm">閲嶇疆</el-button>
+ <div class="report-dialog-head">
+ <div>
+ <div class="report-dialog-head__label">褰撳墠瀹㈡埛</div>
+ <div class="report-dialog-head__name">{{ reportCustomer.customerName }}</div>
+ </div>
+ <el-tag type="primary" effect="light">
+ 宸蹭笂浼� {{ reportRows.length }} / 3 涓勾搴�
+ </el-tag>
</div>
- <el-table :data="reportRows"
- border
- size="small"
- style="margin-top: 16px">
- <el-table-column prop="reportYear"
- label="骞村害"
- width="90"
- align="center" />
- <el-table-column prop="reportName"
- label="鎶ヨ〃鍚嶇О"
- min-width="180"
- show-overflow-tooltip />
- <el-table-column label="鎶ヨ〃闄勪欢"
- min-width="260">
- <template #default="scope">
- <FileUpload v-model="scope.row.reportFiles"
- disabled
- :is-show-tip="false" />
- </template>
- </el-table-column>
- <el-table-column prop="uploadUserName"
- label="涓婁紶浜�"
- width="110" />
- <el-table-column prop="updateTime"
- label="涓婁紶鏃堕棿"
- width="170" />
- <el-table-column label="瀹℃壒鐘舵��"
- width="100"
- align="center">
- <template #default="scope">
- <el-tag :type="reportStatusTag(scope.row.auditStatus)">
- {{ reportStatusText(scope.row.auditStatus) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔"
- width="140"
- align="center">
- <template #default="scope">
- <el-button type="primary"
- link
- @click="editReport(scope.row)">淇敼</el-button>
- <el-button type="danger"
- link
- @click="deleteReport(scope.row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <div v-if="reportRows.length === 0"
- class="no-record">鏆傛棤璐㈠姟鎶ヨ〃锛岃鎸夊勾搴︿笂浼犺繎3骞磋储鍔℃姤琛�</div>
+
+ <div class="report-layout">
+ <div class="report-upload-card">
+ <div class="report-card-title">涓婁紶鎴栨浛鎹㈡姤琛�</div>
+ <div class="report-card-tip">姣忎釜骞村害淇濆瓨涓�缁勬姤琛ㄦ枃浠讹紝鍐嶆淇濆瓨灏嗘洿鏂拌骞村害璁板綍銆�</div>
+ <el-form :model="reportForm" label-position="top" class="report-form">
+ <el-form-item label="鎶ヨ〃骞村害">
+ <el-select
+ v-model="reportForm.reportYear"
+ placeholder="璇烽�夋嫨骞村害"
+ style="width: 100%"
+ @change="selectReportYear"
+ >
+ <el-option
+ v-for="year in reportYears"
+ :key="year"
+ :label="year + '骞�'"
+ :value="year"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶ヨ〃鍚嶇О">
+ <el-input
+ v-model="reportForm.reportName"
+ placeholder="渚嬪锛�2026骞村害璐㈠姟鎶ヨ〃"
+ clearable
+ />
+ </el-form-item>
+ <el-form-item label="鎶ヨ〃闄勪欢">
+ <FileUpload
+ v-model="reportForm.reportFiles"
+ :limit="5"
+ :file-size="20"
+ :file-type="['pdf', 'doc', 'docx', 'xls', 'xlsx', 'jpg', 'png', 'zip', 'rar']"
+ />
+ </el-form-item>
+ </el-form>
+ <div class="report-actions">
+ <el-button type="primary" :loading="reportSaving" @click="saveReport">
+ {{ reportYearRecord(reportForm.reportYear) ? "淇濆瓨淇敼" : "淇濆瓨涓婁紶" }}
+ </el-button>
+ <el-button @click="resetReportForm">娓呯┖</el-button>
+ </div>
+ </div>
+
+ <div class="report-year-list">
+ <div class="report-card-title">杩�3骞翠笂浼犳儏鍐�</div>
+ <div
+ v-for="year in reportYears"
+ :key="year"
+ class="report-year-card"
+ :class="{ 'is-empty': !reportYearRecord(year) }"
+ >
+ <div class="report-year-card__year">{{ year }}骞�</div>
+ <template v-if="reportYearRecord(year)">
+ <div class="report-year-card__body">
+ <div class="report-year-card__name">
+ {{ reportYearRecord(year).reportName || year + "骞村害璐㈠姟鎶ヨ〃" }}
+ </div>
+ <div class="report-year-card__meta">
+ 涓婁紶浜猴細{{ reportYearRecord(year).uploadUserName || "-" }} 路
+ {{ reportYearRecord(year).updateTime || "-" }}
+ </div>
+ <FileUpload
+ v-model="reportYearRecord(year).reportFiles"
+ disabled
+ :is-show-tip="false"
+ />
+ </div>
+ <div class="report-year-card__actions">
+ <el-tag :type="reportStatusTag(reportYearRecord(year).auditStatus)">
+ {{ reportStatusText(reportYearRecord(year).auditStatus) }}
+ </el-tag>
+ <el-button type="primary" link @click="editReport(reportYearRecord(year))">
+ 淇敼
+ </el-button>
+ <el-button type="danger" link @click="deleteReport(reportYearRecord(year))">
+ 鍒犻櫎
+ </el-button>
+ </div>
+ </template>
+ <template v-else>
+ <div class="report-year-card__empty">灏氭湭涓婁紶</div>
+ <el-button type="primary" link @click="selectReportYear(year)">绔嬪嵆涓婁紶</el-button>
+ </template>
+ </div>
+ </div>
+ </div>
<template #footer>
<div class="dialog-footer">
<el-button @click="closeReportDialog">鍏抽棴</el-button>
@@ -921,8 +936,12 @@
const loadReports = customerId => {
listCustomerFinancialReport({ customerId }).then(res => {
reportRows.value = res.data || [];
+ selectReportYear(reportForm.reportYear);
});
};
+
+ const reportYearRecord = year =>
+ reportRows.value.find(item => Number(item.reportYear) === Number(year));
const reportStatusText = status => {
if (status === 1) return "宸查�氳繃";
@@ -937,17 +956,26 @@
const resetReportForm = () => {
reportForm.reportYear = nowYear;
- reportForm.reportName = "";
+ reportForm.reportName = `${nowYear}骞村害璐㈠姟鎶ヨ〃`;
reportForm.reportFiles = "";
};
+ const selectReportYear = year => {
+ reportForm.reportYear = Number(year);
+ const current = reportYearRecord(year);
+ reportForm.reportName = current?.reportName || `${year}骞村害璐㈠姟鎶ヨ〃`;
+ reportForm.reportFiles = current?.reportFiles || "";
+ };
+
const editReport = row => {
- reportForm.reportYear = row.reportYear;
- reportForm.reportName = row.reportName;
- reportForm.reportFiles = row.reportFiles;
+ selectReportYear(row.reportYear);
};
const saveReport = () => {
+ if (!reportForm.reportName?.trim()) {
+ proxy.$modal.msgWarning("璇疯緭鍏ユ姤琛ㄥ悕绉�");
+ return;
+ }
if (!reportForm.reportFiles) {
proxy.$modal.msgWarning("璇蜂笂浼犺储鍔℃姤琛ㄩ檮浠�");
return;
@@ -1073,17 +1101,130 @@
font-size: 14px;
}
- .report-customer {
- font-size: 14px;
- color: #606266;
- margin-bottom: 12px;
+ .report-dialog-head {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 14px 18px;
+ margin-bottom: 16px;
+ background: linear-gradient(135deg, #eef5ff, #f8fbff);
+ border: 1px solid #dbe9fb;
+ border-radius: 10px;
+
+ &__label {
+ margin-bottom: 3px;
+ font-size: 12px;
+ color: #8491a5;
+ }
+
+ &__name {
+ font-size: 17px;
+ font-weight: 700;
+ color: #23334d;
+ }
+ }
+
+ .report-layout {
+ display: grid;
+ grid-template-columns: 360px minmax(0, 1fr);
+ gap: 18px;
+ align-items: start;
+ }
+
+ .report-upload-card,
+ .report-year-list {
+ padding: 18px;
+ background: #fff;
+ border: 1px solid #e5eaf1;
+ border-radius: 10px;
+ }
+
+ .report-card-title {
+ margin-bottom: 6px;
+ font-size: 16px;
+ font-weight: 700;
+ color: #26364d;
+ }
+
+ .report-card-tip {
+ margin-bottom: 14px;
+ font-size: 12px;
+ line-height: 1.6;
+ color: #8a95a6;
}
.report-form {
- margin-bottom: 4px;
+ :deep(.el-form-item) {
+ margin-bottom: 14px;
+ }
}
.report-actions {
+ display: flex;
+ justify-content: flex-end;
margin-top: 10px;
}
+
+ .report-year-card {
+ display: flex;
+ align-items: flex-start;
+ gap: 14px;
+ padding: 14px;
+ margin-top: 12px;
+ background: #f9fbfe;
+ border: 1px solid #dfe7f2;
+ border-radius: 9px;
+
+ &.is-empty {
+ align-items: center;
+ color: #98a2b3;
+ background: #fafafa;
+ border-style: dashed;
+ }
+
+ &__year {
+ flex: 0 0 58px;
+ padding: 6px 8px;
+ font-weight: 700;
+ color: #1254b5;
+ text-align: center;
+ background: #eaf2ff;
+ border-radius: 6px;
+ }
+
+ &__body {
+ flex: 1;
+ min-width: 0;
+ }
+
+ &__name {
+ margin-bottom: 5px;
+ font-weight: 600;
+ color: #303b4c;
+ }
+
+ &__meta {
+ margin-bottom: 5px;
+ font-size: 12px;
+ color: #8a95a6;
+ }
+
+ &__actions {
+ display: flex;
+ flex: 0 0 auto;
+ align-items: center;
+ gap: 4px;
+ }
+
+ &__empty {
+ flex: 1;
+ font-size: 13px;
+ }
+ }
+
+ @media (max-width: 900px) {
+ .report-layout {
+ grid-template-columns: 1fr;
+ }
+ }
</style>
diff --git a/src/views/collaborativeApproval/approvalManagement/index.vue b/src/views/collaborativeApproval/approvalManagement/index.vue
index 1bcafa9..efd7a2c 100644
--- a/src/views/collaborativeApproval/approvalManagement/index.vue
+++ b/src/views/collaborativeApproval/approvalManagement/index.vue
@@ -241,7 +241,7 @@
{ value: "2", label: "璇峰亣绠$悊", icon: "Calendar", color: "#67C23A" },
{ value: "3", label: "鍑哄樊绠$悊", icon: "Location", color: "#E6A23C" },
// { value: '4', label: '鎶ラ攢绠$悊', icon: 'Money', color: '#F56C6C' },
- // { value: '5', label: '閲囪喘瀹℃壒', icon: 'ShoppingCart', color: '#909399' },
+ { value: "5", label: "閲囪喘瀹℃壒", icon: "ShoppingCart", color: "#4F7EF7" },
// { value: '6', label: '鎶ヤ环瀹℃壒', icon: 'DocumentChecked', color: '#9B59B6' },
// { value: '7', label: '鍙戣揣瀹℃壒', icon: 'Van', color: '#1ABC9C' },
];
@@ -252,7 +252,7 @@
2: "璇峰亣绠$悊",
3: "鍑哄樊绠$悊",
// 4: '鎶ラ攢绠$悊',
- // 5: '閲囪喘瀹℃壒',
+ 5: "閲囪喘瀹℃壒",
// 6: '鎶ヤ环瀹℃壒',
// 7: '鍙戣揣瀹℃壒',
};
diff --git a/src/views/collaborativeApproval/approvalProcess/fileList.vue b/src/views/collaborativeApproval/approvalProcess/fileList.vue
index 1f1b671..2c71b2a 100644
--- a/src/views/collaborativeApproval/approvalProcess/fileList.vue
+++ b/src/views/collaborativeApproval/approvalProcess/fileList.vue
@@ -5,7 +5,6 @@
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button link type="primary" @click="downLoadFile(scope.row)">涓嬭浇</el-button>
- <el-button link type="primary" @click="lookFile(scope.row)">棰勮</el-button>
<el-button link type="danger" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -63,4 +62,4 @@
})
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 4a84c09..3976873 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -210,7 +210,7 @@
{ value: "2", label: "璇峰亣绠$悊", icon: "Calendar", color: "#67C23A" },
{ value: "3", label: "鍑哄樊绠$悊", icon: "Location", color: "#E6A23C" },
// { value: '4', label: '鎶ラ攢绠$悊', icon: 'Money', color: '#F56C6C' },
- // { value: '5', label: '閲囪喘瀹℃壒', icon: 'ShoppingCart', color: '#909399' },
+ { value: "5", label: "閲囪喘瀹℃壒", icon: "ShoppingCart", color: "#4F7EF7" },
// { value: '6', label: '鎶ヤ环瀹℃壒', icon: 'DocumentChecked', color: '#9B59B6' },
// { value: '7', label: '鍙戣揣瀹℃壒', icon: 'Van', color: '#1ABC9C' },
];
diff --git a/src/views/collaborativeApproval/sealManagement/index.vue b/src/views/collaborativeApproval/sealManagement/index.vue
index a06f6d5..71b1e1e 100644
--- a/src/views/collaborativeApproval/sealManagement/index.vue
+++ b/src/views/collaborativeApproval/sealManagement/index.vue
@@ -137,7 +137,6 @@
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="previewFile(scope.row)">棰勮</el-button>
<el-button link type="primary" size="small" @click="downloadFile(scope.row)">涓嬭浇</el-button>
</template>
</el-table-column>
@@ -517,4 +516,4 @@
.attachment-table {
border-radius: 4px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/collaborativeApproval/shipmentReview/fileList.vue b/src/views/collaborativeApproval/shipmentReview/fileList.vue
index 555312a..becbed3 100644
--- a/src/views/collaborativeApproval/shipmentReview/fileList.vue
+++ b/src/views/collaborativeApproval/shipmentReview/fileList.vue
@@ -5,7 +5,6 @@
<el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="downLoadFile(scope.row)">涓嬭浇</el-button>
- <el-button link type="primary" size="small" @click="lookFile(scope.row)">棰勮</el-button>
</template>
</el-table-column>
</el-table>
@@ -39,4 +38,4 @@
})
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/financialManagement/voucher/index.vue b/src/views/financialManagement/voucher/index.vue
index 0c02d51..ea00645 100644
--- a/src/views/financialManagement/voucher/index.vue
+++ b/src/views/financialManagement/voucher/index.vue
@@ -245,7 +245,6 @@
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="previewFile(scope.row)">棰勮</el-button>
<el-button link type="primary" size="small" @click="downloadFile(scope.row)">涓嬭浇</el-button>
</template>
</el-table-column>
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index d057f16..a39a60d 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -161,12 +161,6 @@
{{ file.name || file.originalFilename }}
</span>
<div class="file-actions">
- <el-link v-if="file.previewURL || file.url"
- type="primary"
- :underline="false"
- @click="openFile(file.previewURL || file.url)">棰勮</el-link>
- <el-divider v-if="(file.previewURL || file.url) && file.downloadURL"
- direction="vertical" />
<el-link v-if="file.downloadURL"
type="primary"
:underline="false"
@@ -283,4 +277,4 @@
align-items: center;
flex-shrink: 0;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/procurementManagement/procurementLedger/fileList.vue b/src/views/procurementManagement/procurementLedger/fileList.vue
index 945d6a1..528cf83 100644
--- a/src/views/procurementManagement/procurementLedger/fileList.vue
+++ b/src/views/procurementManagement/procurementLedger/fileList.vue
@@ -5,7 +5,6 @@
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="downLoadFile(scope.row)">涓嬭浇</el-button>
- <el-button link type="primary" size="small" @click="lookFile(scope.row)">棰勮</el-button>
<el-button link type="danger" size="small" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -63,4 +62,4 @@
})
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/projectManagement/Management/components/ProjectExecutionPanel.vue b/src/views/projectManagement/Management/components/ProjectExecutionPanel.vue
index 50ac2e9..9f42356 100644
--- a/src/views/projectManagement/Management/components/ProjectExecutionPanel.vue
+++ b/src/views/projectManagement/Management/components/ProjectExecutionPanel.vue
@@ -1,7 +1,7 @@
<template>
<div v-loading="loading" class="execution-panel">
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
- <el-tab-pane v-if="data.sourceBusiness?.id" label="鏉ユ簮涓氬姟" name="business">
+ <el-tab-pane v-if="!singleTab && data.sourceBusiness?.id" label="鏉ユ簮涓氬姟" name="business">
<el-descriptions :column="3" border>
<el-descriptions-item label="涓氬姟缂栧彿">{{ data.sourceBusiness.id }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰鍚嶇О">{{ data.sourceBusiness.projectName || '-' }}</el-descriptions-item>
@@ -19,10 +19,10 @@
</el-descriptions>
</el-tab-pane>
- <el-tab-pane label="妯″潡璁剧疆" name="modules">
+ <el-tab-pane v-if="!singleTab || singleTab === 'modules'" :label="readonly ? '妯″潡淇℃伅' : '妯″潡绠$悊'" name="modules">
<div class="tab-actions">
<span class="hint">妯″潡鍗犻」鐩伐浣滈噺鍚堣锛歿{ totalModuleWeight }}%</span>
- <el-button v-hasPermi="['project:module:edit']" type="primary" @click="openModule()">鏂板妯″潡</el-button>
+ <el-button v-if="!readonly" v-hasPermi="['project:module:edit']" type="primary" @click="openModuleBatch">{{ isStarted ? '绠$悊鎵ц浜�' : '缂栬緫妯″潡' }}</el-button>
</div>
<el-table :data="data.modules" border>
<el-table-column prop="moduleName" label="妯″潡鍚嶇О" min-width="160" />
@@ -41,56 +41,75 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="140" align="center" fixed="right">
- <template #default="{ row }">
- <el-button v-hasPermi="['project:module:edit']" link type="primary" @click="openModule(row)">淇敼</el-button>
- <el-button v-hasPermi="['project:module:remove']" link type="danger" @click="removeModule(row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="椤圭洰璺熻繘" name="follow">
+ <el-tab-pane v-if="isStarted && (!singleTab || singleTab === 'follow')" label="椤圭洰璺熻繘" name="follow">
<div class="tab-actions">
<div class="hint">
璺熻繘鍛ㄦ湡锛歿{ followCycleLabel }}锛�
<span v-if="data.followWindow?.dueDate">鏈搴旇窡杩涙棩 {{ data.followWindow.dueDate }}锛屽彲濉啓 {{ data.followWindow.windowStart }} 鑷� {{ data.followWindow.windowEnd }}</span>
<span v-else>棣栨璺熻繘鍙洿鎺ュ~鍐�</span>
</div>
- <el-button v-hasPermi="['project:follow:add']" type="primary" @click="openFollow()">濉啓璺熻繘</el-button>
+ <el-button v-if="!readonly" v-hasPermi="['project:follow:add']" type="primary" @click="openFollow()">濉啓璺熻繘</el-button>
</div>
<el-table :data="data.followUps" border>
<el-table-column prop="followDate" label="璺熻繘鏃ユ湡" width="130" />
<el-table-column prop="createUserName" label="椤圭洰璐熻矗浜�" width="140" />
<el-table-column prop="detail" label="璺熻繘璇︽儏" min-width="300" show-overflow-tooltip />
- <el-table-column label="闄勪欢" width="100" align="center"><template #default="{ row }">{{ row.attachmentList?.length || 0 }}</template></el-table-column>
- <el-table-column label="鎿嶄綔" width="130" align="center"><template #default="{ row }"><el-button v-hasPermi="['project:follow:remove']" link type="danger" @click="removeRecord('follow', row)">鍒犻櫎</el-button></template></el-table-column>
+ <el-table-column label="闄勪欢" min-width="190">
+ <template #default="{ row }">
+ <div v-if="row.attachmentList?.length" class="file-cell"><el-button v-for="(file,index) in row.attachmentList" :key="file.id || index" link type="primary" @click="download(file)">{{ file.name || file.fileName || `闄勪欢${index + 1}` }}</el-button></div>
+ <span v-else class="empty-file">鏃犻檮浠�</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="!readonly" label="鎿嶄綔" width="140" align="center"><template #default="{ row }"><el-button v-hasPermi="['project:follow:add']" link type="primary" @click="openFollow(row)">缂栬緫</el-button><el-button v-hasPermi="['project:follow:remove']" link type="danger" @click="removeRecord('follow', row)">鍒犻櫎</el-button></template></el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="杩涘害姹囨姤涓庣粺璁�" name="reports">
- <div class="tab-actions">
- <span class="hint">鎴愬憳瀹屾垚姣旈噸鏍规嵁妯″潡宸ヤ綔閲忋�佹瘡娆℃柊澧炶繘搴﹀強璇ユ姹囨姤浜哄憳姣旈噸璁$畻</span>
- <el-button v-hasPermi="['project:report:add']" type="primary" :disabled="!eligibleReportModules.length" @click="openReport()">鏂板姹囨姤</el-button>
- </div>
- <div class="report-layout">
- <div ref="chartRef" class="chart" />
- <el-table :data="data.reports" border class="report-table">
- <el-table-column prop="moduleName" label="椤圭洰妯″潡" min-width="130" />
- <el-table-column label="姹囨姤浜哄憳姣旈噸" min-width="210"><template #default="{ row }"><el-tag v-for="member in row.reporterShareList || []" :key="member.userId" class="member-tag">{{ member.userName }} {{ member.moduleShare }}%</el-tag></template></el-table-column>
- <el-table-column prop="progress" label="妯″潡杩涘害" width="100"><template #default="{ row }">{{ row.progress }}%</template></el-table-column>
- <el-table-column prop="reportDate" label="鏃堕棿" width="120" />
- <el-table-column prop="remark" label="澶囨敞" min-width="180" show-overflow-tooltip />
- <el-table-column label="鏂囦欢" width="80" align="center"><template #default="{ row }">{{ row.attachmentList?.length || 0 }}</template></el-table-column>
- <el-table-column label="鎿嶄綔" width="90" align="center"><template #default="{ row }"><el-button v-hasPermi="['project:report:remove']" link type="danger" @click="removeRecord('report', row)">鍒犻櫎</el-button></template></el-table-column>
- </el-table>
+ <el-tab-pane v-if="isStarted && (!singleTab || singleTab === 'reports')" label="椤圭洰姹囨姤" name="reports">
+ <div class="report-workbench">
+ <aside class="report-module-nav">
+ <div class="report-nav-title">姹囨姤鑼冨洿</div>
+ <button type="button" class="report-nav-item" :class="{ active: reportModuleFilter === 'all' }" @click="selectReportModule('all')">
+ <span class="report-nav-name">鍏ㄩ儴锛堟暣涓」鐩級</span>
+ <span class="report-nav-meta">鍏� {{ data.reports.length }} 鏉℃眹鎶�</span>
+ </button>
+ <button v-for="module in data.modules" :key="module.id" type="button" class="report-nav-item" :class="{ active: reportModuleFilter === String(module.id) }" @click="selectReportModule(String(module.id))">
+ <span class="report-nav-name">{{ module.moduleName }}</span>
+ <span class="report-nav-meta">杩涘害 {{ Number(module.currentProgress || 0) }}% 路 {{ moduleReportCount(module.id) }} 鏉℃眹鎶�</span>
+ </button>
+ </aside>
+ <section class="report-content">
+ <div class="tab-actions">
+ <span class="report-stat-summary">{{ reportStatisticsSummary }}</span>
+ <el-button v-if="!readonly" v-hasPermi="['project:report:add']" type="primary" :disabled="!eligibleReportModules.length" @click="openReport()">鏂板姹囨姤</el-button>
+ </div>
+ <div class="report-layout" :class="{ 'report-only': !readonly }">
+ <div v-if="readonly" ref="chartRef" class="chart" />
+ <el-table :data="filteredReports" border class="report-table">
+ <el-table-column prop="moduleName" label="椤圭洰妯″潡" min-width="130" />
+ <el-table-column label="姹囨姤浜哄憳姣旈噸" min-width="210"><template #default="{ row }"><el-tag v-for="member in row.reporterShareList || []" :key="member.userId" class="member-tag">{{ member.userName }} {{ member.moduleShare }}%</el-tag></template></el-table-column>
+ <el-table-column prop="incrementProgress" label="鏈杩涘害" width="100"><template #default="{ row }">{{ row.incrementProgress ?? row.progress }}%</template></el-table-column>
+ <el-table-column prop="reportDate" label="鏃堕棿" width="120" />
+ <el-table-column prop="remark" label="澶囨敞" min-width="180" show-overflow-tooltip />
+ <el-table-column label="鏂囦欢" min-width="190">
+ <template #default="{ row }">
+ <div v-if="row.attachmentList?.length" class="file-cell"><el-button v-for="(file,index) in row.attachmentList" :key="file.id || index" link type="primary" @click="download(file)">{{ file.name || file.fileName || `闄勪欢${index + 1}` }}</el-button></div>
+ <span v-else class="empty-file">鏃犻檮浠�</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="!readonly" label="鎿嶄綔" width="140" align="center"><template #default="{ row }"><el-button v-if="canEditReport(row)" v-hasPermi="['project:report:add']" link type="primary" @click="openReport(row)">缂栬緫</el-button><el-button v-if="canEditReport(row)" v-hasPermi="['project:report:remove']" link type="danger" @click="removeRecord('report', row)">鍒犻櫎</el-button></template></el-table-column>
+ </el-table>
+ </div>
+ </section>
</div>
</el-tab-pane>
- <el-tab-pane label="椤圭洰璧勬枡" name="materials">
+ <el-tab-pane v-if="!singleTab || singleTab === 'materials'" label="椤圭洰璧勬枡" name="materials">
<div class="tab-actions">
<span class="hint">椤圭洰鏁翠綋璧勬枡搴擄紝涓庝笟鍔¢檮浠跺拰鍗曟姹囨姤闄勪欢鍒嗗紑淇濆瓨</span>
- <el-button v-hasPermi="['project:material:add']" type="primary" @click="openMaterial()">涓婁紶璧勬枡</el-button>
+ <el-button v-if="!readonly" v-hasPermi="['project:material:add']" type="primary" @click="openMaterial()">涓婁紶璧勬枡</el-button>
</div>
<el-table :data="data.materials" border>
<el-table-column prop="materialName" label="璧勬枡鍚嶇О" min-width="220" />
@@ -105,34 +124,62 @@
</el-button>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="90" align="center"><template #default="{ row }"><el-button v-hasPermi="['project:material:remove']" link type="danger" @click="removeRecord('material', row)">鍒犻櫎</el-button></template></el-table-column>
+ <el-table-column v-if="!readonly" label="鎿嶄綔" width="90" align="center"><template #default="{ row }"><el-button v-hasPermi="['project:material:remove']" link type="danger" @click="removeRecord('material', row)">鍒犻櫎</el-button></template></el-table-column>
</el-table>
</el-tab-pane>
+
+ <template v-if="!singleTab">
+ <el-tab-pane v-for="stage in visibleProcessStages" :key="stage.code" :label="stage.label" :name="stage.code">
+ <el-empty v-if="!stageRecords(stage.code).length" description="鏆傛棤闃舵鍔炵悊璁板綍" />
+ <el-timeline v-else class="phase-record-timeline">
+ <el-timeline-item v-for="record in stageRecords(stage.code)" :key="`${stage.code}-${record.id || record.actionTime}`" :timestamp="formatActionTime(record.actionTime)" placement="top" :type="phaseRecordType(record.actionType)">
+ <el-card shadow="never" class="phase-record-card">
+ <template #header>
+ <div class="phase-record-head"><div><strong>{{ record.actionLabel || stage.phaseName }}</strong><el-tag size="small" :type="phaseRecordType(record.actionType)">{{ recordStatusLabel(record) }}</el-tag></div><span>鎿嶄綔浜猴細{{ record.operatorName || '-' }}</span></div>
+ </template>
+ <el-descriptions v-if="phaseFieldRows(record).length" :column="2" border>
+ <el-descriptions-item v-for="field in phaseFieldRows(record)" :key="field.label" :label="field.label">{{ field.value }}</el-descriptions-item>
+ </el-descriptions>
+ <div v-if="record.remark" class="phase-record-remark"><b>鍔炵悊璇存槑锛�</b>{{ record.remark }}</div>
+ <div v-if="record.attachmentList?.length" class="phase-record-files"><b>鐩稿叧闄勪欢锛�</b><el-button v-for="(file,index) in record.attachmentList" :key="file.id || index" link type="primary" @click="download(file)">{{ file.name || file.fileName || `闄勪欢${index + 1}` }}</el-button></div>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </el-tab-pane>
+ </template>
</el-tabs>
- <el-dialog v-model="moduleVisible" :title="moduleForm.id ? '淇敼妯″潡' : '鏂板妯″潡'" width="760px" destroy-on-close>
- <el-form ref="moduleFormRef" :model="moduleForm" :rules="moduleRules" label-width="130px">
- <el-alert v-if="moduleForm.locked" title="璇ユā鍧楀凡鏈夎繘搴︽眹鎶ワ紝鍩虹淇℃伅鍜屾ā鍧楀崰姣斿凡閿佸畾锛屼粎鍙皟鏁存墽琛屼汉銆�" type="warning" :closable="false" class="dialog-tip" />
- <el-form-item label="妯″潡鍚嶇О" prop="moduleName"><el-input v-model="moduleForm.moduleName" :disabled="moduleForm.locked" /></el-form-item>
- <el-form-item label="棰勮寮�濮嬫椂闂�" prop="plannedStartDate"><el-date-picker v-model="moduleForm.plannedStartDate" :disabled="moduleForm.locked" type="date" value-format="YYYY-MM-DD" style="width: 100%" /></el-form-item>
- <el-form-item label="妯″潡姒傝" prop="summary"><el-input v-model="moduleForm.summary" :disabled="moduleForm.locked" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
- <el-form-item label="椤圭洰宸ヤ綔閲忓崰姣�" prop="projectWeight"><el-input-number v-model="moduleForm.projectWeight" :disabled="moduleForm.locked" :min="0" :max="moduleWeightMax" :precision="2" /><span class="unit">%</span><div class="percent-hint">鍏朵粬妯″潡鍚堣 {{ otherModuleWeight }}%锛屽綋鍓嶆ā鍧楀彲璋冭寖鍥� 0锝瀧{ moduleWeightMax }}%锛屼繚瀛樺悗鎬昏 {{ moduleWeightAfterChange }}%</div></el-form-item>
- <el-form-item label="妯″潡鎵ц浜�" required>
- <div class="member-editor">
- <div v-for="(member, index) in moduleForm.members" :key="index" class="member-row">
- <el-select v-model="member.userId" filterable placeholder="璇烽�夋嫨鎵ц浜�" @change="id => syncMemberName(member, id)">
- <el-option v-for="user in projectExecutorOptions" :key="user.value" :label="user.label" :value="user.value" />
- </el-select>
- <el-button link type="danger" @click="moduleForm.members.splice(index, 1)">鍒犻櫎</el-button>
+ <el-dialog v-model="moduleVisible" :title="isStarted ? '绠$悊妯″潡鎵ц浜�' : '缂栬緫椤圭洰妯″潡'" width="1100px" top="4vh" destroy-on-close>
+ <el-alert :title="isStarted ? '椤圭洰寮�濮嬪悗妯″潡淇℃伅涓嶅彲淇敼锛屼粎鍙柊澧炴墽琛屼汉锛涘凡鏈夋湰妯″潡宸ヤ綔鍗犳瘮鐨勬墽琛屼汉涓嶈兘鍒犻櫎銆�' : '鎵�鏈夋ā鍧椾竴娆℃�т繚瀛橈紝宸ヤ綔閲忓崰姣斿悎璁″繀椤讳负100%鍚庨」鐩墠鑳藉紑濮嬨��'" type="info" :closable="false" class="dialog-tip" />
+ <div class="module-total" :class="{ invalid: Number(moduleDraftTotal) !== 100 }">妯″潡宸ヤ綔閲忓悎璁★細{{ moduleDraftTotal }}%锛屽墿浣欏彲鍒嗛厤锛歿{ moduleDraftRemaining }}%</div>
+ <div v-for="(module, moduleIndex) in moduleDrafts" :key="module.localKey" class="module-batch-card">
+ <div class="module-batch-title">
+ <strong>妯″潡 {{ moduleIndex + 1 }}</strong>
+ <span v-if="module.locked" class="locked-tip">椤圭洰宸插紑濮嬶紝妯″潡淇℃伅涓嶅彲淇敼</span>
+ <el-button v-if="!isStarted && !module.locked" link type="danger" @click="removeModuleDraft(moduleIndex)">绉婚櫎妯″潡</el-button>
+ </div>
+ <div class="module-grid">
+ <el-form-item label="妯″潡鍚嶇О" required><el-input v-model="module.moduleName" :disabled="module.locked" /></el-form-item>
+ <el-form-item label="棰勮寮�濮�" required><el-date-picker v-model="module.plannedStartDate" :disabled="module.locked" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item>
+ <el-form-item label="宸ヤ綔閲忓崰姣�" required><el-input-number v-model="module.projectWeight" :disabled="module.locked" :min="0.01" :max="draftWeightMax(moduleIndex)" :precision="2" /><span class="unit">%</span><div class="percent-hint">鍏朵粬妯″潡 {{ otherDraftWeight(moduleIndex) }}%锛屾湰妯″潡鏈�澶� {{ draftWeightMax(moduleIndex) }}%</div></el-form-item>
+ <el-form-item label="妯″潡姒傝" required class="summary-item"><el-input v-model="module.summary" :disabled="module.locked" type="textarea" :rows="2" maxlength="1000" show-word-limit /></el-form-item>
+ <el-form-item label="妯″潡鎵ц浜�" required class="members-item">
+ <div class="member-editor">
+ <div v-for="(member, memberIndex) in module.members" :key="memberIndex" class="member-row">
+ <el-select v-model="member.userId" :disabled="member.hasReportedShare" filterable placeholder="璇烽�夋嫨鎵ц浜�" @change="id => syncMemberName(member, id)"><el-option v-for="user in userOptions" :key="user.value" :label="user.label" :value="user.value" /></el-select>
+ <el-tag v-if="member.hasReportedShare" type="warning">宸插畬鎴愭ā鍧楀崰姣旓細{{ member.completedModuleShare }}%</el-tag>
+ <el-button v-else link type="danger" @click="module.members.splice(memberIndex, 1)">鍒犻櫎</el-button>
+ </div>
+ <el-button link type="primary" @click="module.members.push({ userId:null, userName:'', hasReportedShare:false, completedModuleShare:0 })">+ 娣诲姞鎵ц浜�</el-button>
</div>
- <el-button link type="primary" @click="moduleForm.members.push({ userId: null, userName: '' })">+ 娣诲姞鎵ц浜�</el-button>
- </div>
- </el-form-item>
- </el-form>
- <template #footer><el-button @click="moduleVisible = false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submitModule">淇濆瓨</el-button></template>
+ </el-form-item>
+ </div>
+ </div>
+ <el-button v-if="!isStarted" type="primary" plain @click="addModuleDraft">+ 娣诲姞妯″潡</el-button>
+ <template #footer><el-button @click="moduleVisible = false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submitModuleBatch">淇濆瓨</el-button></template>
</el-dialog>
- <el-dialog v-model="followVisible" title="濉啓椤圭洰璺熻繘" width="650px" destroy-on-close>
+ <el-dialog v-model="followVisible" :title="followForm.id ? '缂栬緫椤圭洰璺熻繘' : '濉啓椤圭洰璺熻繘'" width="650px" destroy-on-close>
<el-form ref="followFormRef" :model="followForm" :rules="followRules" label-width="90px">
<el-form-item label="璺熻繘鏃ユ湡" prop="followDate"><el-date-picker v-model="followForm.followDate" type="date" value-format="YYYY-MM-DD" style="width: 100%" /></el-form-item>
<el-form-item label="璺熻繘璇︽儏" prop="detail"><el-input v-model="followForm.detail" type="textarea" :rows="5" maxlength="2000" show-word-limit /></el-form-item>
@@ -144,7 +191,7 @@
<el-dialog v-model="reportVisible" title="杩涘害姹囨姤" width="680px" destroy-on-close>
<el-form ref="reportFormRef" :model="reportForm" :rules="reportRules" label-width="100px">
<el-form-item label="鎵�灞為」鐩�"><el-input :model-value="projectInfo?.title" disabled /></el-form-item>
- <el-form-item label="椤圭洰妯″潡" prop="moduleId"><el-select v-model="reportForm.moduleId" style="width: 100%" @change="changeReportModule"><el-option v-for="item in eligibleReportModules" :key="item.id" :label="item.moduleName" :value="item.id" /></el-select><div class="percent-hint">浠呭睍绀哄綋鍓嶇櫥褰曚汉鍙備笌鎵ц鐨勬ā鍧椼��</div></el-form-item>
+ <el-form-item label="椤圭洰妯″潡" prop="moduleId"><el-select v-model="reportForm.moduleId" :disabled="!!reportForm.id" style="width: 100%" @change="changeReportModule"><el-option v-for="item in reportModuleOptions" :key="item.id" :label="item.moduleName" :value="item.id" /></el-select><div class="percent-hint">浠呭睍绀哄綋鍓嶇櫥褰曚汉鍙備笌鎵ц涓斿皻鏈畬鎴愮殑妯″潡锛涘凡鏈夋眹鎶ヤ笉鑳芥洿鎹㈡ā鍧椼��</div></el-form-item>
<el-form-item label="姹囨姤浜哄憳姣旈噸" required>
<div class="member-editor">
<div v-for="(member,index) in reportForm.reporterShares" :key="index" class="reporter-row">
@@ -157,12 +204,12 @@
<div class="share-total">鏈浜哄憳姣旈噸鍚堣锛歿{ reportShareTotal }}%锛屽墿浣欏彲鍒嗛厤锛歿{ reportShareRemaining }}%銆傛瘡浜虹殑涓婇檺浼氶殢鍏朵粬浜哄憳鍗犳瘮鑷姩璋冩暣銆�</div>
</div>
</el-form-item>
- <el-form-item label="妯″潡杩涘害" prop="progress"><el-input-number v-model="reportForm.progress" :min="0" :max="100" :precision="2" /><span class="unit">%</span></el-form-item>
- <el-form-item label="姹囨姤鏃堕棿" prop="reportDate"><el-date-picker v-model="reportForm.reportDate" type="date" value-format="YYYY-MM-DD" style="width: 100%" /></el-form-item>
+ <el-form-item label="鏈杩涘害" prop="incrementProgress"><el-input-number v-model="reportForm.incrementProgress" :min="0.01" :max="reportIncrementMax" :precision="2" /><span class="unit">%</span><span class="current-progress-hint">{{ reportProgressHint }}</span></el-form-item>
+ <el-form-item label="姹囨姤鏃堕棿" prop="reportDate"><el-date-picker v-model="reportForm.reportDate" :disabled="!!reportForm.id" type="date" value-format="YYYY-MM-DD" style="width: 100%" /><div v-if="reportForm.id" class="percent-hint">缂栬緫宸叉湁姹囨姤鏃朵笉鍏佽璋冩暣鏃堕棿锛屼互淇濊瘉鍘嗗彶杩涘害椤哄簭姝g‘銆�</div></el-form-item>
<el-form-item label="澶囨敞"><el-input v-model="reportForm.remark" type="textarea" :rows="3" maxlength="2000" show-word-limit /></el-form-item>
<el-form-item label="鏂囦欢"><AttachmentUploadFile v-model:file-list="reportFiles" :limit="10" /></el-form-item>
</el-form>
- <template #footer><el-button @click="reportVisible = false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submitReport">鎻愪氦姹囨姤</el-button></template>
+ <template #footer><el-button @click="reportVisible = false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submitReport">{{ reportForm.id ? '淇濆瓨淇敼' : '鎻愪氦姹囨姤' }}</el-button></template>
</el-dialog>
<el-dialog v-model="materialVisible" title="涓婁紶椤圭洰璧勬枡" width="650px" destroy-on-close>
@@ -181,38 +228,87 @@
import { computed, getCurrentInstance, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import * as echarts from 'echarts'
+import dayjs from 'dayjs'
import AttachmentUploadFile from '@/components/AttachmentUpload/file/index.vue'
import { userListAll } from '@/api/publicApi'
import {
- deleteProjectFollowUp, deleteProjectMaterial, deleteProjectModule, deleteProjectProgressReport,
- getProjectWorkflow, saveProjectFollowUp, saveProjectMaterial, saveProjectModule, saveProjectProgressReport
+ deleteProjectFollowUp, deleteProjectMaterial, deleteProjectProgressReport,
+ getProjectWorkflow, saveProjectFollowUp, saveProjectMaterial, saveProjectModulesBatch, saveProjectProgressReport
} from '@/api/projectManagement/workflow'
import useUserStore from '@/store/modules/user'
-const props = defineProps({ projectId: [String, Number], projectInfo: { type: Object, default: () => ({}) } })
+const props = defineProps({
+ projectId: [String, Number],
+ projectInfo: { type: Object, default: () => ({}) },
+ readonly: { type: Boolean, default: false },
+ singleTab: { type: String, default: '' }
+})
+const emit = defineEmits(['project-updated'])
const { proxy } = getCurrentInstance()
const userStore = useUserStore()
const loading = ref(false)
const saving = ref(false)
-const activeTab = ref('modules')
+const activeTab = ref(props.singleTab || 'modules')
+const reportModuleFilter = ref('all')
const userOptions = ref([])
-const data = reactive({ modules: [], followUps: [], reports: [], materials: [], sourceBusiness: {}, memberStatistics: [], followWindow: {} })
+const data = reactive({ modules: [], followUps: [], reports: [], materials: [], phases: [], phaseHistories: [], sourceBusiness: {}, memberStatistics: [], followWindow: {} })
const chartRef = ref()
let chart
-const today = () => new Date().toISOString().slice(0, 10)
+const today = () => dayjs().format('YYYY-MM-DD')
const totalModuleWeight = computed(() => data.modules.reduce((sum, row) => sum + Number(row.projectWeight || 0), 0).toFixed(2))
const reportShareTotal = computed(() => reportForm.reporterShares.reduce((sum, row) => sum + Number(row.moduleShare || 0), 0).toFixed(2))
const reportShareRemaining = computed(() => Math.max(0, 100 - Number(reportShareTotal.value)).toFixed(2))
const followCycleLabel = computed(() => ({ MONTH: '姣忔湀', QUARTER: '姣忓搴�', YEAR: '姣忓勾' }[props.projectInfo?.followCycle] || props.projectInfo?.followCycle || '姣忔湀'))
-const projectExecutorOptions = computed(() => {
- const ids = new Set((props.projectInfo?.projectExecutorIds || []).map(String))
- return userOptions.value.filter(user => ids.has(String(user.value)))
-})
-const eligibleReportModules = computed(() => data.modules.filter(module =>
+const isStarted = computed(() => !!props.projectInfo?.currentPhase && props.projectInfo.currentPhase !== '鏈紑濮�')
+const memberReportModules = computed(() => data.modules.filter(module =>
(module.members || []).some(member => String(member.userId) === String(userStore.id))
))
+const eligibleReportModules = computed(() => memberReportModules.value.filter(module => Number(module.currentProgress || 0) < 100))
+const reportModuleOptions = computed(() => reportForm.id ? memberReportModules.value : eligibleReportModules.value)
const selectedReportModule = computed(() => data.modules.find(module => String(module.id) === String(reportForm.moduleId)))
+const reportBaseProgress = computed(() => Number(reportForm.id ? reportForm.previousProgress : selectedReportModule.value?.currentProgress || 0))
+const reportIncrementMax = computed(() => {
+ if (!reportForm.id) return Math.max(0.01, Number((100 - reportBaseProgress.value).toFixed(2)))
+ const current = Number(selectedReportModule.value?.currentProgress || 0)
+ return Math.max(0.01, Number((Number(reportForm.originalIncrementProgress || 0) + 100 - current).toFixed(2)))
+})
+const reportProgressHint = computed(() => {
+ const current = Number(selectedReportModule.value?.currentProgress || 0).toFixed(2)
+ if (reportForm.id) return `璇ユ姹囨姤鍓嶄负 ${reportBaseProgress.value.toFixed(2)}%锛屾ā鍧楀綋鍓嶄负 ${current}%`
+ return `妯″潡褰撳墠杩涘害 ${current}%锛屾湰娆℃渶澶氬彲姹囨姤 ${reportIncrementMax.value}%`
+})
+const filteredReports = computed(() => reportModuleFilter.value === 'all'
+ ? data.reports
+ : data.reports.filter(report => String(report.moduleId) === reportModuleFilter.value))
+const filteredMemberStatistics = computed(() => {
+ if (reportModuleFilter.value === 'all') return data.memberStatistics || []
+ const totals = new Map()
+ for (const report of filteredReports.value) {
+ const incrementProgress = Number(report.incrementProgress ?? report.progress ?? 0)
+ for (const member of report.reporterShareList || []) {
+ const userId = String(member.userId)
+ const current = totals.get(userId) || { userId: member.userId, userName: member.userName || '鏈懡鍚�', value: 0 }
+ current.value += incrementProgress * Number(member.moduleShare || 0) / 100
+ totals.set(userId, current)
+ }
+ }
+ return [...totals.values()]
+ .map(item => ({ ...item, value: Number(item.value.toFixed(2)) }))
+ .sort((a, b) => b.value - a.value)
+})
+const reportStatisticsSummary = computed(() => {
+ const prefix = reportModuleFilter.value === 'all' ? '椤圭洰鍗犳瘮缁熻' : '妯″潡鍗犳瘮缁熻'
+ if (!filteredMemberStatistics.value.length) return `${prefix}锛氭殏鏃犳暟鎹甡
+ return `${prefix}锛�${filteredMemberStatistics.value.map(item => `${item.userName} ${item.value}%`).join('锛�')}`
+})
+const processStages = [
+ { code: 'APPLICATION', label: '鐢虫姤璁板綍', phaseName: '鐢虫姤', rank: 3 },
+ { code: 'RESULT', label: '鐢虫姤缁撴灉', phaseName: '鐢虫姤缁撴灉', rank: 4 },
+ { code: 'ACCEPTANCE', label: '楠屾敹璁板綍', phaseName: '楠屾敹', rank: 5 }
+]
+const currentPhaseRank = computed(() => ({ 鏈紑濮�: 0, 绔嬮」: 1, 寮�鍙�: 2, 鐢虫姤: 3, 鐢虫姤缁撴灉: 4, 楠屾敹: 5, 宸插畬鎴�: 6 })[props.projectInfo?.currentPhase] || 0)
+const visibleProcessStages = computed(() => processStages.filter(stage => currentPhaseRank.value >= stage.rank))
const moduleReporterOptions = computed(() => {
const members = selectedReportModule.value?.members || []
return members.map(member => ({
@@ -222,21 +318,18 @@
})
const moduleVisible = ref(false)
-const moduleFormRef = ref()
-const moduleForm = reactive({ id: null, moduleName: '', plannedStartDate: '', summary: '', projectWeight: 0, members: [], locked: false })
-const otherModuleWeight = computed(() => Number(data.modules.reduce((sum, row) =>
- String(row.id) === String(moduleForm.id) ? sum : sum + Number(row.projectWeight || 0), 0).toFixed(2)))
-const moduleWeightMax = computed(() => Math.max(0, Number((100 - otherModuleWeight.value).toFixed(2))))
-const moduleWeightAfterChange = computed(() => Number((otherModuleWeight.value + Number(moduleForm.projectWeight || 0)).toFixed(2)))
-const moduleRules = { moduleName: [{ required: true, message: '璇疯緭鍏ユā鍧楀悕绉�', trigger: 'blur' }], plannedStartDate:[{required:true,message:'璇烽�夋嫨棰勮寮�濮嬫椂闂�',trigger:'change'}],summary:[{required:true,message:'璇疯緭鍏ユā鍧楁瑕�',trigger:'blur'}], projectWeight: [{ required: true, message: '璇疯緭鍏ュ伐浣滈噺鍗犳瘮', trigger: 'change' }] }
+const moduleDrafts = ref([])
+let draftSequence = 0
+const moduleDraftTotal = computed(() => moduleDrafts.value.reduce((sum, module) => sum + Number(module.projectWeight || 0), 0).toFixed(2))
+const moduleDraftRemaining = computed(() => (100 - Number(moduleDraftTotal.value)).toFixed(2))
const followVisible = ref(false)
const followFormRef = ref()
-const followForm = reactive({ followDate: today(), detail: '' })
+const followForm = reactive({ id: null, followDate: today(), detail: '' })
const followFiles = ref([])
const followRules = { followDate: [{ required: true, message: '璇烽�夋嫨璺熻繘鏃ユ湡', trigger: 'change' }], detail: [{ required: true, message: '璇疯緭鍏ヨ窡杩涜鎯�', trigger: 'blur' }] }
const reportVisible = ref(false)
const reportFormRef = ref()
-const reportForm = reactive({ moduleId: null, reporterShares: [], progress: 0, reportDate: today(), remark: '' })
+const reportForm = reactive({ id: null, moduleId: null, reporterShares: [], incrementProgress: 0, originalIncrementProgress: 0, previousProgress: 0, reportDate: today(), remark: '' })
const reportFiles = ref([])
const reportRules = { moduleId: [{ required: true, message: '璇烽�夋嫨椤圭洰妯″潡', trigger: 'change' }], reportDate: [{ required: true, message: '璇烽�夋嫨姹囨姤鏃堕棿', trigger: 'change' }] }
const materialVisible = ref(false)
@@ -261,36 +354,69 @@
} finally { loading.value = false }
}
-function openModule(row = null) {
- Object.assign(moduleForm, {
- id: row?.id || null, moduleName: row?.moduleName || '', plannedStartDate: row?.plannedStartDate || '',
- summary: row?.summary || '', projectWeight: Number(row?.projectWeight || 0),
- members: (row?.members || []).map(member => ({ userId: member.userId, userName: member.userName })),
- locked: Number(row?.reportCount || 0) > 0
- })
- if (!moduleForm.members.length) moduleForm.members.push({ userId: null, userName: '' })
+function newModuleDraft(row = {}) {
+ return {
+ id: row.id || null, localKey: row.id ? `module-${row.id}` : `new-${++draftSequence}`,
+ moduleName: row.moduleName || '', plannedStartDate: row.plannedStartDate || '', summary: row.summary || '',
+ projectWeight: Number(row.projectWeight || 0),
+ members: (row.members || []).map(member => {
+ const reportStats = memberReportedContribution(row, member.userId)
+ return { userId: member.userId, userName: member.userName, ...reportStats }
+ }),
+ locked: isStarted.value
+ }
+}
+
+function memberReportedContribution(module, userId) {
+ let hasReportedShare = false
+ const completedModuleShare = data.reports
+ .filter(report => String(report.moduleId) === String(module.id))
+ .reduce((total, report) => {
+ const memberShare = (report.reporterShareList || [])
+ .filter(member => String(member.userId) === String(userId))
+ .reduce((sum, member) => sum + Number(member.moduleShare || 0), 0)
+ if (memberShare > 0) hasReportedShare = true
+ const incrementProgress = Number(report.incrementProgress ?? report.progress ?? 0)
+ return total + incrementProgress * memberShare / 100
+ }, 0)
+ return { hasReportedShare, completedModuleShare: Number(completedModuleShare.toFixed(2)) }
+}
+
+function openModuleBatch() {
+ moduleDrafts.value = data.modules.map(newModuleDraft)
+ if (!moduleDrafts.value.length) addModuleDraft()
moduleVisible.value = true
}
+function addModuleDraft() { moduleDrafts.value.push(newModuleDraft({ members: [{ userId: null, userName: '', hasReportedShare: false, completedModuleShare: 0 }] })) }
+function removeModuleDraft(index) { moduleDrafts.value.splice(index, 1) }
+function otherDraftWeight(index) { return moduleDrafts.value.reduce((sum, module, i) => i === index ? sum : sum + Number(module.projectWeight || 0), 0).toFixed(2) }
+function draftWeightMax(index) { return Math.max(0.01, Number((100 - Number(otherDraftWeight(index))).toFixed(2))) }
+
function syncMemberName(member, id) { member.userName = userOptions.value.find(user => String(user.value) === String(id))?.label || '' }
-async function submitModule() {
- await moduleFormRef.value?.validate()
- if (!moduleForm.members.length || moduleForm.members.some(member => !member.userId)) return ElMessage.warning('璇疯嚦灏戦�夋嫨涓�鍚嶆ā鍧楁墽琛屼汉')
- if (new Set(moduleForm.members.map(member => String(member.userId))).size !== moduleForm.members.length) return ElMessage.warning('妯″潡鎵ц浜轰笉鑳介噸澶�')
+async function submitModuleBatch() {
+ if (!moduleDrafts.value.length) return ElMessage.warning('璇疯嚦灏戞坊鍔犱竴涓」鐩ā鍧�')
+ if (moduleDrafts.value.some(module => !module.moduleName?.trim() || !module.plannedStartDate || !module.summary?.trim())) return ElMessage.warning('璇峰畬鏁村~鍐欐墍鏈夋ā鍧楃殑鍚嶇О銆侀璁″紑濮嬫椂闂村拰妯″潡姒傝')
+ if (Number(moduleDraftTotal.value) !== 100) return ElMessage.warning('鎵�鏈夋ā鍧楃殑椤圭洰宸ヤ綔閲忓崰姣斿悎璁″繀椤讳负100%')
+ for (const module of moduleDrafts.value) {
+ if (!module.members.length || module.members.some(member => !member.userId)) return ElMessage.warning(`璇蜂负妯″潡鈥�${module.moduleName}鈥濊嚦灏戦�夋嫨涓�鍚嶆墽琛屼汉`)
+ if (new Set(module.members.map(member => String(member.userId))).size !== module.members.length) return ElMessage.warning(`妯″潡鈥�${module.moduleName}鈥濈殑鎵ц浜轰笉鑳介噸澶峘)
+ }
saving.value = true
try {
- await saveProjectModule({ ...moduleForm, projectId: props.projectId })
- ElMessage.success('妯″潡淇濆瓨鎴愬姛'); moduleVisible.value = false; await loadData()
+ await saveProjectModulesBatch({ projectId: props.projectId, modules: moduleDrafts.value })
+ ElMessage.success('鍏ㄩ儴妯″潡淇濆瓨鎴愬姛'); moduleVisible.value = false; await loadData()
} finally { saving.value = false }
}
-async function removeModule(row) {
- await ElMessageBox.confirm(`纭鍒犻櫎妯″潡鈥�${row.moduleName}鈥濆悧锛焋, '鎻愮ず', { type: 'warning' })
- await deleteProjectModule(row.id); ElMessage.success('鍒犻櫎鎴愬姛'); await loadData()
+function openFollow(row) {
+ Object.assign(followForm, row
+ ? { id: row.id, followDate: row.followDate, detail: row.detail || '' }
+ : { id: null, followDate: today(), detail: '' })
+ followFiles.value = row ? [...(row.attachmentList || [])] : []
+ followVisible.value = true
}
-
-function openFollow() { Object.assign(followForm, { followDate: data.followWindow?.dueDate || today(), detail: '' }); followFiles.value = []; followVisible.value = true }
function normalizeFiles(list) { return list.map(file => ({ id: file.id ?? file.fileId ?? file.rawData?.id, name: file.name ?? file.fileName ?? file.rawData?.originalFilename, url: file.url ?? file.fileUrl ?? file.rawData?.url })).filter(file => file.id || file.url) }
async function submitFollow() {
@@ -299,12 +425,36 @@
finally { saving.value = false }
}
-function openReport() {
- if (!eligibleReportModules.value.length) return ElMessage.warning('鍙湁妯″潡鎵ц浜烘墠鑳藉~鍐欒妯″潡鐨勮繘搴︽眹鎶�')
+function openReport(row) {
+ if (row) {
+ if (!memberReportModules.value.some(module => String(module.id) === String(row.moduleId))) return ElMessage.warning('鍙湁璇ユā鍧楁墽琛屼汉鎵嶈兘缂栬緫杩涘害姹囨姤')
+ const incrementProgress = Number(row.incrementProgress ?? row.progress ?? 0)
+ Object.assign(reportForm, {
+ id: row.id, moduleId: row.moduleId,
+ reporterShares: (row.reporterShareList || []).map(member => ({ ...member })),
+ incrementProgress, originalIncrementProgress: incrementProgress,
+ previousProgress: Number(row.previousProgress || 0), reportDate: row.reportDate, remark: row.remark || ''
+ })
+ reportFiles.value = [...(row.attachmentList || [])]
+ reportVisible.value = true
+ return
+ }
+ if (!eligibleReportModules.value.length) return ElMessage.warning('褰撳墠娌℃湁鍙眹鎶ョ殑鏈畬鎴愭ā鍧楋紝鎴栨偍涓嶆槸妯″潡鎵ц浜�')
const userId = userStore.id
const userName = userOptions.value.find(user => String(user.value) === String(userId))?.label || userStore.name || ''
- const module = eligibleReportModules.value[0]
- Object.assign(reportForm, { moduleId: module.id, reporterShares: userId ? [{ userId, userName, moduleShare: 100 }] : [], progress: Number(module.currentProgress || 0), reportDate: today(), remark: '' })
+ const module = reportModuleFilter.value === 'all'
+ ? null
+ : eligibleReportModules.value.find(item => String(item.id) === reportModuleFilter.value)
+ Object.assign(reportForm, {
+ id: null,
+ moduleId: module?.id ?? null,
+ reporterShares: module && userId ? [{ userId, userName, moduleShare: 100 }] : [],
+ incrementProgress: 0,
+ originalIncrementProgress: 0,
+ previousProgress: Number(module?.currentProgress || 0),
+ reportDate: today(),
+ remark: ''
+ })
reportFiles.value = []; reportVisible.value = true
}
@@ -312,8 +462,13 @@
const module = data.modules.find(item => String(item.id) === String(moduleId))
const userId = userStore.id
const userName = module?.members?.find(member => String(member.userId) === String(userId))?.userName || userStore.name || ''
- reportForm.progress = Number(module?.currentProgress || 0)
+ reportForm.incrementProgress = 0
+ reportForm.previousProgress = Number(module?.currentProgress || 0)
reportForm.reporterShares = userId ? [{ userId, userName, moduleShare: 100 }] : []
+}
+
+function canEditReport(row) {
+ return memberReportModules.value.some(module => String(module.id) === String(row.moduleId))
}
function reporterShareLimit(index) {
@@ -327,8 +482,15 @@
if (!reportForm.reporterShares.length || reportForm.reporterShares.some(member => !member.userId)) return ElMessage.warning('璇疯嚦灏戦�夋嫨涓�鍚嶆眹鎶ヤ汉鍛�')
if (new Set(reportForm.reporterShares.map(member => String(member.userId))).size !== reportForm.reporterShares.length) return ElMessage.warning('姹囨姤浜哄憳涓嶈兘閲嶅')
if (Number(reportShareTotal.value) !== 100) return ElMessage.warning('鏈姹囨姤浜哄憳姣旈噸鍚堣蹇呴』涓�100%')
+ if (Number(reportForm.incrementProgress || 0) <= 0) return ElMessage.warning('鏈杩涘害蹇呴』澶т簬0')
saving.value = true
- try { await saveProjectProgressReport({ ...reportForm, projectId: props.projectId, attachments: normalizeFiles(reportFiles.value) }); ElMessage.success('姹囨姤宸叉彁浜�'); reportVisible.value = false; await loadData() }
+ try {
+ await saveProjectProgressReport({ ...reportForm, projectId: props.projectId, attachments: normalizeFiles(reportFiles.value) })
+ ElMessage.success(reportForm.id ? '姹囨姤淇敼宸蹭繚瀛�' : '姹囨姤宸叉彁浜�')
+ reportVisible.value = false
+ await loadData()
+ emit('project-updated')
+ }
finally { saving.value = false }
}
@@ -345,6 +507,7 @@
await ElMessageBox.confirm('纭鍒犻櫎杩欐潯璁板綍鍚楋紵', '鎻愮ず', { type: 'warning' })
const api = { follow: deleteProjectFollowUp, report: deleteProjectProgressReport, material: deleteProjectMaterial }[type]
await api(row.id); ElMessage.success('鍒犻櫎鎴愬姛'); await loadData()
+ if (type === 'report') emit('project-updated')
}
function download(file) { if (!file?.url) return ElMessage.warning('闄勪欢鏆傛棤涓嬭浇鍦板潃'); proxy.$download.byUrl(file.url, file.name || file.fileName) }
@@ -352,9 +515,10 @@
function renderChart() {
if (!chartRef.value) return
chart ||= echarts.init(chartRef.value)
- const source = data.memberStatistics || []
+ const source = filteredMemberStatistics.value
+ const isAll = reportModuleFilter.value === 'all'
chart.setOption({
- title: { text: '鎴愬憳宸插畬鎴愬伐浣滈噺姣旈噸', left: 'center', textStyle: { fontSize: 15 } },
+ title: { text: isAll ? '鎴愬憳椤圭洰鍗犳瘮' : '鎴愬憳妯″潡鍗犳瘮', left: 'center', textStyle: { fontSize: 15 } },
tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
legend: { bottom: 0 },
series: [{ type: 'pie', radius: ['38%', '68%'], center: ['50%', '48%'], data: source.map(item => ({ name: item.userName || '鏈懡鍚�', value: Number(item.value || 0) })), label: { formatter: '{b}\n{c}' } }]
@@ -362,6 +526,28 @@
}
function handleTabChange(name) { if (name === 'reports') nextTick(renderChart) }
+function selectReportModule(moduleId) { reportModuleFilter.value = moduleId; nextTick(renderChart) }
+function moduleReportCount(moduleId) { return data.reports.filter(report => String(report.moduleId) === String(moduleId)).length }
+function stageRecords(phaseCode) {
+ const histories = (data.phaseHistories || []).filter(record => record.phaseCode === phaseCode)
+ if (histories.length) return histories
+ const snapshot = (data.phases || []).find(record => record.phaseCode === phaseCode)
+ if (!snapshot || snapshot.status === 'NOT_STARTED') return []
+ return [{ ...snapshot, actionLabel: snapshot.phaseName, actionType: snapshot.status === 'COMPLETED' ? 'PASS' : 'ENTER' }]
+}
+function formatActionTime(time) { return time ? String(time).replace('T', ' ') : '鏃堕棿鏈褰�' }
+function phaseRecordType(type) { return ['RECTIFY', 'SUPPLEMENT'].includes(type) ? 'warning' : type === 'REJECTED' ? 'danger' : type === 'PASS' ? 'success' : 'primary' }
+function recordStatusLabel(record) { return record.actionType === 'RECTIFY' ? '闇�瑕佹暣鏀�' : record.actionType === 'SUPPLEMENT' ? '闇�瑕佽ˉ鍏�' : record.actionType === 'REJECTED' ? '鏈�氳繃' : record.actionType === 'PASS' ? '宸查�氳繃' : '宸插姙鐞�' }
+function phaseFieldRows(record) {
+ const form = record.formData || {}
+ const labels = {
+ applicationDate: '鐢虫姤鏃ユ湡', applicationType: '鐢虫姤绫诲瀷', applicationName: '鐢虫姤鍚嶇О', expectedFeedbackDate: '棰勮鍙嶉鏃ユ湡', description: '鐢虫姤璇存槑',
+ resultDate: '缁撴灉鏃ユ湡', resultStatus: '鐢虫姤缁撴灉', resultDescription: '缁撴灉璇存槑', acceptancePlanDate: '璁″垝楠屾敹鏃ユ湡',
+ acceptor: '楠屾敹浜�/瀹㈡埛', acceptanceStandard: '楠屾敹鏍囧噯', acceptanceDate: '楠屾敹鏃ユ湡', acceptanceResult: '楠屾敹缁撴灉', acceptanceDescription: '楠屾敹璇存槑'
+ }
+ const enumLabels = { PASS: '閫氳繃', SUPPLEMENT: '闇�瑕佽ˉ鍏�', REJECTED: '鏈�氳繃', RECTIFY: '闇�瑕佹暣鏀�' }
+ return Object.entries(labels).filter(([key]) => form[key] !== null && form[key] !== undefined && form[key] !== '').map(([key, label]) => ({ label, value: enumLabels[form[key]] || form[key] }))
+}
function resizeChart() { chart?.resize() }
onMounted(async () => { await Promise.all([loadUsers(), loadData()]); window.addEventListener('resize', resizeChart) })
onBeforeUnmount(() => { window.removeEventListener('resize', resizeChart); chart?.dispose() })
@@ -372,16 +558,42 @@
.execution-panel { min-height: 260px; }
.tab-actions { display: flex; align-items: center; justify-content: space-between; margin: 4px 0 14px; }
.hint { color: #606266; font-size: 13px; }
+.report-stat-summary { color: #606266; font-size: 13px; line-height: 1.7; }
+.report-workbench { display: grid; grid-template-columns: 210px minmax(0, 1fr); gap: 16px; align-items: start; }
+.report-module-nav { padding: 12px; border: 1px solid #e4e7ed; border-radius: 10px; background: #f8fafc; }
+.report-nav-title { padding: 4px 10px 10px; color: #303133; font-size: 14px; font-weight: 600; }
+.report-nav-item { width: 100%; margin: 0 0 8px; padding: 11px 12px; border: 1px solid transparent; border-radius: 8px; background: transparent; color: #303133; text-align: left; cursor: pointer; transition: all .2s; }
+.report-nav-item:last-child { margin-bottom: 0; }
+.report-nav-item:hover { border-color: #b8cdf8; background: #eef4ff; }
+.report-nav-item.active { border-color: #8fb2f5; background: #e8f1ff; color: #0b46b5; box-shadow: 0 2px 7px rgba(11, 70, 181, .08); }
+.report-nav-name, .report-nav-meta { display: block; }
+.report-nav-name { overflow: hidden; font-size: 13px; font-weight: 600; text-overflow: ellipsis; white-space: nowrap; }
+.report-nav-meta { margin-top: 5px; color: #909399; font-size: 12px; line-height: 1.35; }
+.report-nav-item.active .report-nav-meta { color: #5e7fbf; }
+.report-content { min-width: 0; }
.member-tag { margin: 2px 6px 2px 0; }
.report-layout { display: grid; grid-template-columns: minmax(300px, 34%) 1fr; gap: 14px; }
+.report-layout.report-only { grid-template-columns: 1fr; }
.chart { height: 390px; border: 1px solid #ebeef5; border-radius: 6px; }
.report-table { min-width: 0; }
.member-editor { width: 100%; }
-.member-row { display: grid; grid-template-columns: 1fr 52px; align-items: center; gap: 10px; margin-bottom: 10px; }
+.member-row { display: grid; grid-template-columns: minmax(260px, 1fr) auto 52px; align-items: center; gap: 10px; margin-bottom: 10px; }
.reporter-row { display: grid; grid-template-columns: 1fr 150px 24px 52px; align-items: center; gap: 10px; margin-bottom: 10px; }
.share-total { margin-top: 8px; color: #606266; }
.percent-hint { width: 100%; margin-top: 5px; color: #909399; font-size: 12px; line-height: 1.5; }
.dialog-tip { margin-bottom: 16px; }
.unit { margin-left: 8px; color: #606266; }
+.current-progress-hint { margin-left: 14px; color: #909399; font-size: 12px; }
+.phase-record-timeline { padding: 14px 12px 0 8px; }.phase-record-card { border-color: #dce6f5; }.phase-record-head { display:flex;align-items:center;justify-content:space-between;gap:16px; }.phase-record-head>div { display:flex;align-items:center;gap:10px; }.phase-record-head>span { color:#909399;font-size:12px; }.phase-record-remark,.phase-record-files { margin-top:14px;color:#606266;font-size:13px;line-height:1.7; }.phase-record-files { display:flex;align-items:center;flex-wrap:wrap;gap:4px; }
+.file-cell { display:flex;flex-direction:column;align-items:flex-start;gap:2px; }.file-cell .el-button { max-width:100%;margin-left:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; }.empty-file { color:#c0c4cc;font-size:12px; }
+.module-total { margin: 0 0 14px; font-weight: 600; color: #067647; }
+.module-total.invalid { color: #d97706; }
+.module-batch-card { margin-bottom: 14px; padding: 16px 16px 4px; border: 1px solid #dcdfe6; border-radius: 8px; background: #fafcff; }
+.module-batch-title { display: flex; align-items: center; gap: 14px; margin-bottom: 14px; }
+.module-batch-title .el-button { margin-left: auto; }
+.locked-tip { color: #e6a23c; font-size: 12px; }
+.module-grid { display: grid; grid-template-columns: 1.2fr 1fr 1.25fr; column-gap: 18px; }
+.summary-item, .members-item { grid-column: 1 / -1; }
@media (max-width: 1200px) { .report-layout { grid-template-columns: 1fr; } }
+@media (max-width: 900px) { .report-workbench { grid-template-columns: 1fr; } .report-module-nav { display: grid; grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); gap: 8px; } .report-nav-title { grid-column: 1 / -1; } .report-nav-item { margin: 0; } }
</style>
diff --git a/src/views/projectManagement/Management/components/formDia.vue b/src/views/projectManagement/Management/components/formDia.vue
index 15ebe43..5e1e6ef 100644
--- a/src/views/projectManagement/Management/components/formDia.vue
+++ b/src/views/projectManagement/Management/components/formDia.vue
@@ -1,51 +1,32 @@
<template>
- <el-dialog v-model="visible" :title="dialogTitle" :width="startProject ? '1100px' : '900px'" destroy-on-close>
+ <el-dialog v-model="visible" :title="dialogTitle" width="900px" destroy-on-close>
<el-alert v-if="isBusinessProject" title="璇ラ」鐩敱涓氬姟瀹℃壒鐢熸垚锛屼繚瀛樺悗鍙湪椤圭洰璇︽儏鏌ョ湅鏉ユ簮涓氬姟鍙婂叾闄勪欢銆�" type="info" :closable="false" class="tip" />
+ <el-alert v-if="startProject" title="寮�濮嬮」鐩箣鍓嶏紝璇峰厛閫氳繃鍒楄〃涓殑鈥滄ā鍧楃鐞嗏�濇妸鎵�鏈夋ā鍧楃殑宸ヤ綔閲忓崰姣斿垎閰嶅埌100%銆�" type="info" :closable="false" class="tip" />
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
- <el-row v-if="!personnelOnly" :gutter="20">
+ <el-row :gutter="20">
<el-col :span="12"><el-form-item label="椤圭洰鍚嶇О" prop="title"><el-input v-model="form.title" maxlength="200" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="瀹㈡埛鍚嶇О" prop="clientName"><el-select v-model="form.clientName" filterable clearable style="width:100%" @change="syncCustomer"><el-option v-for="item in customers" :key="item.id" :label="item.customerName" :value="item.customerName" /></el-select></el-form-item></el-col>
</el-row>
- <el-row v-if="!personnelOnly" :gutter="20">
+ <el-row :gutter="20">
<el-col :span="12"><el-form-item label="椤圭洰鍒嗙被" prop="projectClassification"><el-tree-select v-model="form.projectClassification" :data="categoryTree" :props="{ label:'categoryName',value:'categoryName',children:'children' }" check-strictly clearable :filterable="false" placeholder="璇烽�夋嫨椤圭洰鍒嗙被" style="width:100%" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="椤圭洰鏉ユ簮"><el-input v-model="form.source" disabled /></el-form-item></el-col>
</el-row>
- <el-row v-if="!personnelOnly" :gutter="20">
+ <el-row :gutter="20">
<el-col :span="12"><el-form-item label="棰勮寮�濮嬫椂闂�" prop="planStartTime"><el-date-picker v-model="form.planStartTime" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="棰勮缁撴潫鏃堕棿" prop="planEndTime"><el-date-picker v-model="form.planEndTime" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item></el-col>
</el-row>
- <el-row v-if="!personnelOnly" :gutter="20">
+ <el-row :gutter="20">
<el-col :span="12"><el-form-item label="椤圭洰璐熻矗浜�" prop="projectLeaderId"><el-select v-model="form.projectLeaderId" filterable style="width:100%" @change="syncLeader"><el-option v-for="u in users" :key="u.value" :label="u.label" :value="u.value" /></el-select></el-form-item></el-col>
<el-col :span="12"><el-form-item label="椤圭洰缁忕悊" prop="projectManagerIds"><el-select v-model="form.projectManagerIds" multiple filterable style="width:100%"><el-option v-for="u in users" :key="u.value" :label="u.label" :value="u.value" /></el-select></el-form-item></el-col>
</el-row>
<el-row :gutter="20">
- <el-col :span="24"><el-form-item label="椤圭洰鎵ц浜�" prop="projectExecutorIds"><el-select v-model="form.projectExecutorIds" multiple filterable style="width:100%"><el-option v-for="u in users" :key="u.value" :label="u.label" :value="u.value" /></el-select><div class="field-hint">椤圭洰寮�濮嬪悗浠嶅彲鏂板锛涘凡鏈夐」鐩眹鎶ュ伐浣滃崰姣旂殑鎵ц浜轰笉鑳藉垹闄ゃ��</div></el-form-item></el-col>
- </el-row>
- <el-row v-if="!personnelOnly" :gutter="20">
<el-col :span="8"><el-form-item label="璺熻繘鍛ㄦ湡" prop="followCycle"><el-select v-model="form.followCycle" style="width:100%"><el-option label="姣忔湀" value="MONTH" /><el-option label="姣忓搴�" value="QUARTER" /><el-option label="姣忓勾" value="YEAR" /></el-select></el-form-item></el-col>
<el-col :span="16"><el-form-item label="璺熻繘瑕佹眰" prop="followDetail"><el-input v-model="form.followDetail" maxlength="1000" /></el-form-item></el-col>
</el-row>
- <el-form-item v-if="!personnelOnly" label="椤圭洰澶囨敞"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="2000" show-word-limit /></el-form-item>
- <el-form-item v-if="!personnelOnly" label="椤圭洰璧勬枡"><AttachmentUploadFile v-model:file-list="files" :limit="20" /></el-form-item>
- <template v-if="startProject && !personnelOnly">
- <el-divider content-position="left">椤圭洰妯″潡缁勬垚锛堝紑濮嬮」鐩墠蹇呭~锛�</el-divider>
- <el-alert title="妯″潡宸ヤ綔閲忓崰姣斿悎璁″繀椤讳负100%锛涜繖閲屽彧閫夋嫨鎵ц浜猴紝浜哄憳姣旈噸鍦ㄦ瘡娆¤繘搴︽眹鎶ユ椂濉啓銆�" type="info" :closable="false" class="tip" />
- <div v-for="(module,index) in startModules" :key="module.localKey" class="module-card">
- <div class="module-card__title"><span>妯″潡 {{ index + 1 }}</span><el-button link type="danger" @click="removeStartModule(index)">鍒犻櫎</el-button></div>
- <el-row :gutter="16">
- <el-col :span="8"><el-form-item label="妯″潡鍚嶇О" required><el-input v-model="module.moduleName" maxlength="200" /></el-form-item></el-col>
- <el-col :span="8"><el-form-item label="棰勮寮�濮�" required><el-date-picker v-model="module.plannedStartDate" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item></el-col>
- <el-col :span="8"><el-form-item label="椤圭洰宸ヤ綔閲�" required><el-input-number v-model="module.projectWeight" :min="0" :max="moduleWeightLimit(index)" :precision="2" /><span class="unit">%</span><div class="field-hint">鍏朵粬妯″潡 {{ otherStartModuleWeight(index) }}%锛屽綋鍓嶆渶澶� {{ moduleWeightLimit(index) }}%</div></el-form-item></el-col>
- </el-row>
- <el-row :gutter="16">
- <el-col :span="12"><el-form-item label="妯″潡鎵ц浜�" required><el-select v-model="module.memberIds" multiple filterable style="width:100%"><el-option v-for="u in projectExecutorOptions" :key="u.value" :label="u.label" :value="u.value" /></el-select></el-form-item></el-col>
- <el-col :span="12"><el-form-item label="妯″潡姒傝" required><el-input v-model="module.summary" type="textarea" :rows="2" maxlength="1000" /></el-form-item></el-col>
- </el-row>
- </div>
- <div class="module-actions"><span>褰撳墠妯″潡宸ヤ綔閲忓悎璁★細{{ startModuleWeight }}%</span><el-button type="primary" plain @click="addStartModule">+ 娣诲姞妯″潡</el-button></div>
- </template>
+ <el-form-item label="椤圭洰澶囨敞"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="2000" show-word-limit /></el-form-item>
+ <el-form-item label="椤圭洰璧勬枡"><AttachmentUploadFile v-model:file-list="files" :limit="20" /></el-form-item>
</el-form>
- <template #footer><el-button @click="visible=false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submit">{{ personnelOnly ? '淇濆瓨鎵ц浜�' : startProject ? '淇濆瓨骞跺紑濮嬮」鐩�' : '淇濆瓨' }}</el-button></template>
+ <template #footer><el-button @click="visible=false">鍙栨秷</el-button><el-button type="primary" :loading="saving" @click="submit">{{ startProject ? '淇濆瓨骞跺紑濮嬮」鐩�' : '淇濆瓨' }}</el-button></template>
</el-dialog>
</template>
@@ -55,35 +36,29 @@
import AttachmentUploadFile from '@/components/AttachmentUpload/file/index.vue'
import { addProject, getProject, updateProject } from '@/api/projectManagement/project'
import { listCustomer } from '@/api/basicData/customer'
-import { deleteProjectModule, getProjectWorkflow, listProjectCategories, saveProjectModule, startProjectWorkflow, updateProjectExecutors } from '@/api/projectManagement/workflow'
+import { listProjectCategories, startProjectWorkflow } from '@/api/projectManagement/workflow'
import { userListAll } from '@/api/publicApi'
const emit = defineEmits(['completed'])
const visible = ref(false)
const saving = ref(false)
const startProject = ref(false)
-const personnelOnly = ref(false)
const operationType = ref('add')
const formRef = ref()
const customers = ref([])
const users = ref([])
const categoryTree = ref([])
const files = ref([])
-const startModules = ref([])
-const originalModuleIds = ref([])
-const form = reactive({ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],projectExecutorIds:[],projectExecutorNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' })
+const form = reactive({ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' })
const rules = {
title:[{ required:true,message:'璇疯緭鍏ラ」鐩悕绉�',trigger:'blur' }], clientName:[{ required:true,message:'璇烽�夋嫨瀹㈡埛',trigger:'change' }],
projectClassification:[{ required:true,message:'璇烽�夋嫨椤圭洰鍒嗙被',trigger:'change' }], planStartTime:[{ required:true,message:'璇烽�夋嫨棰勮寮�濮嬫椂闂�',trigger:'change' }],
planEndTime:[{ required:true,message:'璇烽�夋嫨棰勮缁撴潫鏃堕棿',trigger:'change' }], projectLeaderId:[{ required:true,message:'璇烽�夋嫨椤圭洰璐熻矗浜�',trigger:'change' }],
projectManagerIds:[{ required:true,type:'array',min:1,message:'璇烽�夋嫨鑷冲皯涓�鍚嶉」鐩粡鐞�',trigger:'change' }], followCycle:[{ required:true,message:'璇烽�夋嫨璺熻繘鍛ㄦ湡',trigger:'change' }],
- projectExecutorIds:[{ required:true,type:'array',min:1,message:'璇烽�夋嫨鑷冲皯涓�鍚嶉」鐩墽琛屼汉',trigger:'change' }],
followDetail:[{ required:true,message:'璇疯緭鍏ヨ窡杩涜姹�',trigger:'blur' }]
}
const isBusinessProject = computed(() => !!form.sourceBusinessId || form.source === '涓氬姟鐢熸垚' || form.source === '涓氬姟瀹℃壒')
-const startModuleWeight = computed(() => startModules.value.reduce((sum,module)=>sum+Number(module.projectWeight||0),0).toFixed(2))
-const projectExecutorOptions = computed(() => users.value.filter(user=>form.projectExecutorIds.some(id=>String(id)===String(user.value))))
-const dialogTitle = computed(() => personnelOnly.value ? '璋冩暣椤圭洰鎵ц浜�' : startProject.value ? '濉啓绔嬮」淇℃伅骞跺紑濮嬮」鐩�' : operationType.value === 'add' ? '鎵嬪姩鍒涘缓椤圭洰' : '缂栬緫椤圭洰鍩烘湰鎯呭喌')
+const dialogTitle = computed(() => startProject.value ? '濉啓绔嬮」淇℃伅骞跺紑濮嬮」鐩�' : operationType.value === 'add' ? '鎵嬪姩鍒涘缓椤圭洰' : '缂栬緫椤圭洰鍩烘湰鎯呭喌')
function buildTree(list) { const map=new Map((list||[]).map(x=>[String(x.id),{...x,children:[]}])) ; const roots=[]; map.forEach(node=>{ const parent=map.get(String(node.parentId)); if(parent&&node.parentId) parent.children.push(node); else roots.push(node) }); return roots }
async function loadOptions() {
@@ -92,54 +67,27 @@
const userData=userRes?.data||userRes?.rows||userRes||[]; users.value=(Array.isArray(userData)?userData:[]).map(u=>({ label:u.nickName||u.userName||u.name,value:u.userId||u.id }))
categoryTree.value=buildTree(categoryRes?.data||[])
}
-function reset() { Object.assign(form,{ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],projectExecutorIds:[],projectExecutorNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' }); files.value=[];startModules.value=[];originalModuleIds.value=[] }
+function reset() { Object.assign(form,{ id:null,no:'',title:'',clientId:null,clientName:'',source:'鎵嬪姩鍒涘缓',sourceBusinessId:null,projectClassification:'',planStartTime:'',planEndTime:'',projectLeaderId:null,projectLeaderName:'',projectManagerIds:[],projectManagerNames:[],followCycle:'MONTH',followDetail:'',currentPhase:'鏈紑濮�',remark:'' }); files.value=[] }
function syncCustomer(name) { const item=customers.value.find(x=>x.customerName===name); form.clientId=item?.id||item?.customerId||null }
function syncLeader(id) { form.projectLeaderName=users.value.find(u=>String(u.value)===String(id))?.label||'' }
function normalizeFiles(list) { return (list||[]).map(f=>({ id:f.id??f.fileId??f.rawData?.id,name:f.name??f.fileName??f.rawData?.originalFilename,url:f.url??f.fileUrl??f.rawData?.url })).filter(f=>f.id||f.url) }
-function newModule(module={}) { return { localKey:module.id||`${Date.now()}-${Math.random()}`,id:module.id||null,moduleName:module.moduleName||'',plannedStartDate:module.plannedStartDate||'',summary:module.summary||'',projectWeight:Number(module.projectWeight||0),memberIds:(module.members||[]).map(member=>member.userId) } }
-function addStartModule(){startModules.value.push(newModule())}
-function removeStartModule(index){startModules.value.splice(index,1)}
-function otherStartModuleWeight(index){return startModules.value.reduce((sum,module,i)=>sum+(i===index?0:Number(module.projectWeight||0)),0).toFixed(2)}
-function moduleWeightLimit(index){return Math.max(0,100-Number(otherStartModuleWeight(index)))}
-function validateStartModules(){
- if(!startModules.value.length){ElMessage.warning('椤圭洰寮�濮嬪墠璇疯嚦灏戞坊鍔犱竴涓」鐩ā鍧�');return false}
- if(startModules.value.some(module=>!module.moduleName||!module.plannedStartDate||!module.summary||!module.memberIds.length)){ElMessage.warning('璇峰畬鏁村~鍐欐瘡涓ā鍧楃殑鍚嶇О銆侀璁″紑濮嬫椂闂淬�佹ā鍧楁瑕佸拰鎵ц浜�');return false}
- if(Number(startModuleWeight.value)!==100){ElMessage.warning('鎵�鏈夋ā鍧楃殑椤圭洰宸ヤ綔閲忓崰姣斿悎璁″繀椤讳负100%');return false}
- return true
-}
async function openDialog(options={}) {
- reset(); operationType.value=options.operationType||'add'; startProject.value=!!options.startProject; personnelOnly.value=!!options.personnelOnly; await loadOptions()
+ reset(); operationType.value=options.operationType||'add'; startProject.value=!!options.startProject; await loadOptions()
const id=options.row?.id
- if(id) { const res=await getProject(id); const detail=res?.data?.data??res?.data??res; const info=detail?.info||{}; Object.assign(form,info,{ projectManagerIds:info.projectManagerIds||[],projectManagerNames:info.projectManagerNames||[],projectExecutorIds:info.projectExecutorIds||[],projectExecutorNames:info.projectExecutorNames||[] }); files.value=(info.attachmentList||[]).map(f=>({...f})) }
- if(startProject.value&&id){const workflow=await getProjectWorkflow(id);const modules=workflow?.data?.modules||[];startModules.value=modules.map(newModule);originalModuleIds.value=modules.map(module=>module.id);if(!startModules.value.length)addStartModule()}
+ if(id) { const res=await getProject(id); const detail=res?.data?.data??res?.data??res; const info=detail?.info||{}; Object.assign(form,info,{ projectManagerIds:info.projectManagerIds||[],projectManagerNames:info.projectManagerNames||[] }); files.value=(info.attachmentList||[]).map(f=>({...f})) }
visible.value=true
}
async function submit() {
- form.projectExecutorNames=form.projectExecutorIds.map(id=>users.value.find(u=>String(u.value)===String(id))?.label||'').filter(Boolean)
- if(personnelOnly.value){
- if(!form.projectExecutorIds.length)return ElMessage.warning('璇疯嚦灏戜繚鐣欎竴鍚嶉」鐩墽琛屼汉')
- saving.value=true
- try{await updateProjectExecutors({projectId:form.id,executors:form.projectExecutorIds.map(id=>({userId:id,userName:users.value.find(user=>String(user.value)===String(id))?.label||''}))});ElMessage.success('椤圭洰鎵ц浜哄凡鏇存柊');visible.value=false;emit('completed',{id:form.id})}finally{saving.value=false}
- return
- }
await formRef.value?.validate()
if(form.planEndTime < form.planStartTime) return ElMessage.warning('棰勮缁撴潫鏃堕棿涓嶈兘鏃╀簬棰勮寮�濮嬫椂闂�')
- if(startProject.value&&!validateStartModules()) return
form.projectManagerNames=form.projectManagerIds.map(id=>users.value.find(u=>String(u.value)===String(id))?.label||'').filter(Boolean)
const info={ ...form, currentPhase:startProject.value?'鏈紑濮�':form.currentPhase, establishTime:form.establishTime||new Date().toISOString().slice(0,10), managerId:form.projectLeaderId,managerName:form.projectLeaderName,attachmentIds:normalizeFiles(files.value).map(f=>f.id).filter(Boolean),projectManagementPlanId:null }
saving.value=true
try {
await (form.id?updateProject:addProject)({ info,shippingAddress:null,contractInfo:null,salesLedgerProductList:null })
if(startProject.value){
- for(const module of startModules.value){
- const members=module.memberIds.map(id=>({userId:id,userName:users.value.find(user=>String(user.value)===String(id))?.label||''}))
- const res=await saveProjectModule({...module,projectId:form.id,members})
- module.id=res?.data||module.id
- }
- const retainedIds=new Set(startModules.value.map(module=>String(module.id)))
- for(const id of originalModuleIds.value.filter(id=>!retainedIds.has(String(id)))) await deleteProjectModule(id)
await startProjectWorkflow(form.id)
}
ElMessage.success(startProject.value?'椤圭洰宸插紑濮�':'淇濆瓨鎴愬姛')
@@ -150,4 +98,4 @@
defineExpose({ openDialog })
</script>
-<style scoped>.tip{margin-bottom:18px}.module-card{padding:14px 14px 2px;margin-bottom:12px;border:1px solid #dcdfe6;border-radius:6px}.module-card__title,.module-actions{display:flex;align-items:center;justify-content:space-between;margin-bottom:12px}.module-card__title{font-weight:600}.module-actions{color:#606266}.unit{margin-left:6px;color:#606266}.field-hint{width:100%;margin-top:4px;color:#909399;font-size:12px;line-height:18px}</style>
+<style scoped>.tip{margin-bottom:18px}</style>
diff --git a/src/views/projectManagement/Management/index.vue b/src/views/projectManagement/Management/index.vue
index f98ebcb..ff6798e 100644
--- a/src/views/projectManagement/Management/index.vue
+++ b/src/views/projectManagement/Management/index.vue
@@ -17,42 +17,191 @@
<el-table-column prop="source" label="椤圭洰鏉ユ簮" width="110" />
<el-table-column prop="projectClassification" label="椤圭洰鍒嗙被" width="140" />
<el-table-column prop="projectLeaderName" label="椤圭洰璐熻矗浜�" width="120" />
- <el-table-column prop="currentPhase" label="褰撳墠闃舵" width="110"><template #default="{row}"><el-tag :type="row.currentPhase==='宸插畬鎴�'?'success':row.currentPhase==='鏈紑濮�'?'info':'warning'">{{ row.currentPhase || '鏈紑濮�' }}</el-tag></template></el-table-column>
+ <el-table-column prop="currentPhase" label="褰撳墠闃舵" width="110"><template #default="{row}"><el-tag class="phase-tag" :class="phaseTagClass(row.currentPhase)">{{ row.currentPhase || '鏈紑濮�' }}</el-tag></template></el-table-column>
+ <el-table-column prop="projectProgress" label="椤圭洰杩涘害" width="150" align="center"><template #default="{row}"><el-progress :percentage="Number(row.projectProgress || 0)" /></template></el-table-column>
<el-table-column prop="planStartTime" label="棰勮寮�濮�" width="120" />
<el-table-column prop="planEndTime" label="棰勮缁撴潫" width="120" />
- <el-table-column label="鎿嶄綔" width="270" fixed="right" align="center">
+ <el-table-column prop="actualStartTime" label="瀹為檯寮�濮�" width="120"><template #default="{row}">{{ row.actualStartTime || '-' }}</template></el-table-column>
+ <el-table-column prop="actualEndTime" label="瀹為檯缁撴潫" width="120"><template #default="{row}">{{ row.actualEndTime || '-' }}</template></el-table-column>
+ <el-table-column label="鎿嶄綔" width="520" fixed="right" align="center">
<template #default="{row}">
<el-button v-if="row.currentPhase==='鏈紑濮�'" link type="success" @click="start(row)">寮�濮嬮」鐩�</el-button>
<el-button v-if="row.currentPhase==='鏈紑濮�'" link type="primary" @click="edit(row)">缂栬緫</el-button>
- <el-button v-else link type="primary" @click="adjustExecutors(row)">璋冩暣鎵ц浜�</el-button>
+ <el-button v-if="row.currentPhase==='鏈紑濮�'" link type="primary" @click="maintain(row, 'modules')">妯″潡绠$悊</el-button>
+ <el-dropdown v-if="row.currentPhase!=='鏈紑濮�'" class="operation-dropdown" @command="tab => maintain(row, tab)">
+ <el-button link type="primary">椤圭洰缁存姢<el-icon class="el-icon--right"><ArrowDown /></el-icon></el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="modules">妯″潡绠$悊</el-dropdown-item>
+ <el-dropdown-item command="follow">椤圭洰璺熻繘</el-dropdown-item>
+ <el-dropdown-item command="reports">椤圭洰姹囨姤</el-dropdown-item>
+ <el-dropdown-item command="materials">椤圭洰璧勬枡</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
<el-button link type="primary" @click="detail(row)">璇︽儏</el-button>
- <el-button link type="danger" @click="remove(row)">鍒犻櫎</el-button>
+ <el-button v-if="canAdvanceStage(row)" link type="success" @click="advanceStage(row)">{{ nextStageAction(row) }}</el-button>
+ <el-button link type="primary" @click="openLifecycle(row)">椤圭洰鐢熷懡鍛ㄦ湡</el-button>
+ <el-button v-if="row.currentPhase==='鏈紑濮�'" link type="danger" @click="remove(row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" v-model:page="query.pageNum" v-model:limit="query.pageSize" @pagination="load" />
</el-card>
<FormDia ref="formRef" @completed="completed" />
+ <el-dialog v-model="maintenanceVisible" :title="`${selectedProject.title || ''} - ${maintenanceTitle}`" width="92%" top="5vh" destroy-on-close>
+ <ProjectExecutionPanel v-if="maintenanceVisible" :project-id="selectedProject.id" :project-info="selectedProject" :single-tab="maintenanceTab" :readonly="maintenanceReadonly" @project-updated="refreshProjectList" />
+ </el-dialog>
+ <el-drawer v-model="lifecycleVisible" :title="`${lifecycleProject.title || ''} - 椤圭洰鐢熷懡鍛ㄦ湡`" size="520px" destroy-on-close>
+ <div v-loading="lifecycleLoading" class="lifecycle-drawer">
+ <div class="lifecycle-summary">
+ <div><span>褰撳墠闃舵</span><strong>{{ lifecycleProject.currentPhase || '鏈紑濮�' }}</strong></div>
+ <div><span>璁″垝鍛ㄦ湡</span><strong>{{ lifecycleProject.planStartTime || '-' }} 鑷� {{ lifecycleProject.planEndTime || '-' }}</strong></div>
+ <div><span>瀹為檯鍛ㄦ湡</span><strong>{{ lifecycleProject.actualStartTime || '-' }} 鑷� {{ lifecycleProject.actualEndTime || '-' }}</strong></div>
+ </div>
+ <el-empty v-if="!lifecycleLoading && !lifecycleNodes.length" description="鏆傛棤鐢熷懡鍛ㄦ湡璁板綍" />
+ <el-timeline v-else class="project-timeline">
+ <el-timeline-item v-for="node in lifecycleNodes" :key="node.code" :timestamp="formatLifecycleTime(node.time)" placement="top" :type="lifecycleNodeType(node.status,node.eventType)" :hollow="node.status === 'PENDING'">
+ <div class="lifecycle-node" :class="node.status?.toLowerCase()">
+ <div class="lifecycle-node-head"><strong>{{ node.name }}</strong><el-tag size="small" :type="lifecycleTagType(node.status,node.eventType)">{{ node.statusLabel || lifecycleStatusLabel(node.status) }}</el-tag></div>
+ <p>{{ node.description || '鏆傛棤璇存槑' }}</p>
+ </div>
+ </el-timeline-item>
+ </el-timeline>
+ </div>
+ </el-drawer>
+ <el-dialog v-model="stageVisible" :title="stageDialogTitle" width="680px" destroy-on-close>
+ <el-alert :title="`褰撳墠椤圭洰锛�${stageProject.title || '-'}锛屽綋鍓嶉樁娈碉細${stageProject.currentPhase || '-'}`" type="info" :closable="false" class="stage-alert" />
+ <el-form label-width="110px">
+ <template v-if="stageProject.currentPhase==='寮�鍙�'">
+ <el-form-item label="鐢虫姤鏃ユ湡" required><el-date-picker v-model="stageForm.applicationDate" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item>
+ <el-form-item label="鐢虫姤绫诲瀷" required><el-select v-model="stageForm.applicationType" style="width:100%"><el-option v-for="item in ['瀹㈡埛浜や粯','骞冲彴鍙戝竷','杞欢钁椾綔鏉�','鍐呴儴鍙戝竷','鍏朵粬']" :key="item" :label="item" :value="item" /></el-select></el-form-item>
+ <el-form-item label="鐢虫姤鍚嶇О" required><el-input v-model="stageForm.applicationName" maxlength="200" /></el-form-item>
+ <el-form-item label="棰勮鍙嶉鏃ユ湡"><el-date-picker v-model="stageForm.expectedFeedbackDate" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item>
+ <el-form-item label="鐢虫姤璇存槑" required><el-input v-model="stageForm.description" type="textarea" :rows="4" maxlength="2000" show-word-limit /></el-form-item>
+ </template>
+ <template v-else-if="stageProject.currentPhase==='鐢虫姤'">
+ <el-form-item label="缁撴灉鏃ユ湡" required><el-date-picker v-model="stageForm.resultDate" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item>
+ <el-form-item label="鐢虫姤缁撴灉" required><el-radio-group v-model="stageForm.resultStatus"><el-radio value="PASS">閫氳繃</el-radio><el-radio value="SUPPLEMENT">闇�瑕佽ˉ鍏�</el-radio><el-radio value="REJECTED">鏈�氳繃</el-radio></el-radio-group></el-form-item>
+ <el-form-item label="缁撴灉璇存槑" required><el-input v-model="stageForm.resultDescription" type="textarea" :rows="4" maxlength="2000" show-word-limit /></el-form-item>
+ <el-alert v-if="stageForm.resultStatus!=='PASS'" title="淇濆瓨鍚庨」鐩粛鍋滅暀鍦ㄧ敵鎶ラ樁娈碉紝鍙户缁ˉ鍏呮垨閲嶆柊鐧昏缁撴灉銆�" type="warning" :closable="false" />
+ </template>
+ <template v-else-if="stageProject.currentPhase==='鐢虫姤缁撴灉'">
+ <el-form-item label="璁″垝楠屾敹鏃ユ湡" required><el-date-picker v-model="stageForm.acceptancePlanDate" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item>
+ <el-form-item label="楠屾敹浜�/瀹㈡埛" required><el-input v-model="stageForm.acceptor" maxlength="100" /></el-form-item>
+ <el-form-item label="楠屾敹鏍囧噯" required><el-input v-model="stageForm.acceptanceStandard" type="textarea" :rows="4" maxlength="2000" show-word-limit /></el-form-item>
+ </template>
+ <template v-else-if="stageProject.currentPhase==='楠屾敹'">
+ <el-form-item label="楠屾敹鏃ユ湡" required><el-date-picker v-model="stageForm.acceptanceDate" type="date" value-format="YYYY-MM-DD" style="width:100%" /></el-form-item>
+ <el-form-item label="楠屾敹浜�/瀹㈡埛" required><el-input v-model="stageForm.acceptor" maxlength="100" /></el-form-item>
+ <el-form-item label="楠屾敹缁撴灉" required><el-radio-group v-model="stageForm.acceptanceResult"><el-radio value="PASS">閫氳繃</el-radio><el-radio value="RECTIFY">闇�瑕佹暣鏀�</el-radio></el-radio-group></el-form-item>
+ <el-form-item label="楠屾敹璇存槑" required><el-input v-model="stageForm.acceptanceDescription" type="textarea" :rows="4" maxlength="2000" show-word-limit /></el-form-item>
+ <el-alert v-if="stageForm.acceptanceResult==='RECTIFY'" title="淇濆瓨鍚庨」鐩粛鍋滅暀鍦ㄩ獙鏀堕樁娈碉紝鏁存敼瀹屾垚鍚庡彲鍐嶆濉啓楠屾敹缁撴灉銆�" type="warning" :closable="false" />
+ </template>
+ <el-form-item label="鐩稿叧闄勪欢"><AttachmentUploadFile v-model:file-list="stageFiles" :limit="20" /></el-form-item>
+ </el-form>
+ <template #footer><el-button @click="stageVisible=false">鍙栨秷</el-button><el-button type="primary" :loading="stageSaving" @click="submitStage">{{ stageSubmitText }}</el-button></template>
+ </el-dialog>
</div>
</template>
<script setup name="ProjectManagement">
-import { onMounted, reactive, ref } from 'vue'
+import { computed, onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import { listProject, delProject } from '@/api/projectManagement/project'
+import { getProjectLifecycle, saveProjectPhase, transitionProjectStage } from '@/api/projectManagement/workflow'
+import AttachmentUploadFile from '@/components/AttachmentUpload/file/index.vue'
import FormDia from './components/formDia.vue'
+import ProjectExecutionPanel from './components/ProjectExecutionPanel.vue'
const router=useRouter(); const loading=ref(false); const rows=ref([]); const total=ref(0); const formRef=ref()
+const maintenanceVisible=ref(false); const maintenanceTab=ref('modules'); const selectedProject=ref({})
+const lifecycleVisible=ref(false); const lifecycleLoading=ref(false); const lifecycleProject=ref({}); const lifecycleNodes=ref([])
+const stageVisible=ref(false); const stageSaving=ref(false); const stageProject=ref({}); const stageFiles=ref([])
+const stageForm=reactive({applicationDate:'',applicationType:'瀹㈡埛浜や粯',applicationName:'',expectedFeedbackDate:'',description:'',resultDate:'',resultStatus:'PASS',resultDescription:'',acceptancePlanDate:'',acceptor:'',acceptanceStandard:'',acceptanceDate:'',acceptanceResult:'PASS',acceptanceDescription:''})
const query=reactive({ keyword:'',customerName:'',source:'',pageNum:1,pageSize:10 })
async function load(){ loading.value=true; try{ const res=await listProject({ noOrName:query.keyword,clientName:query.customerName,current:query.pageNum,size:query.pageSize }); const data=res?.data?.records||res?.rows||[]; rows.value=(data||[]).filter(r=>!query.source||r.source===query.source); total.value=res?.data?.total||res?.total||0 }finally{loading.value=false} }
function search(){query.pageNum=1;load()} function reset(){Object.assign(query,{keyword:'',customerName:'',source:'',pageNum:1,pageSize:10});load()}
function add(){formRef.value?.openDialog({operationType:'add'})} function edit(row){formRef.value?.openDialog({operationType:'edit',row})} function start(row){formRef.value?.openDialog({operationType:'edit',row,startProject:true})}
-function adjustExecutors(row){formRef.value?.openDialog({operationType:'edit',row,personnelOnly:true})}
+const maintenanceNames={modules:'妯″潡绠$悊',follow:'椤圭洰璺熻繘',reports:'椤圭洰姹囨姤',materials:'椤圭洰璧勬枡'}
+const nextStageMap={寮�鍙�:'鐢虫姤',鐢虫姤:'鐢虫姤缁撴灉',鐢虫姤缁撴灉:'楠屾敹',楠屾敹:'宸插畬鎴�'}
+const maintenanceReadonly=computed(()=>['鐢虫姤','鐢虫姤缁撴灉','楠屾敹','宸插畬鎴�'].includes(selectedProject.value.currentPhase))
+const maintenanceTitle=computed(()=>`${maintenanceNames[maintenanceTab.value]||'椤圭洰缁存姢'}${maintenanceReadonly.value?'锛堝彧璇伙級':''}`)
+function maintain(row,tab){selectedProject.value={...row};maintenanceTab.value=tab;maintenanceVisible.value=true}
+async function refreshProjectList(){
+ await load()
+ const latest=rows.value.find(row=>String(row.id)===String(selectedProject.value.id))
+ if(latest) selectedProject.value={...latest}
+}
function detail(row){router.push(`/projectManagement/Management/detail/${row.id}`)}
+function canAdvanceStage(row){
+ if(!nextStageMap[row.currentPhase]) return false
+ return row.currentPhase!=='寮�鍙�'||Number(row.projectProgress||0)>=100
+}
+function phaseTagClass(phase){
+ return ({鏈紑濮�:'phase-not-started',绔嬮」:'phase-initiation',寮�鍙�:'phase-development',鐢虫姤:'phase-application',鐢虫姤缁撴灉:'phase-result',楠屾敹:'phase-acceptance',宸插畬鎴�:'phase-completed'})[phase]||'phase-not-started'
+}
+function nextStageAction(row){return ({寮�鍙�:'鎻愪氦鐢虫姤',鐢虫姤:'鐧昏鐢虫姤缁撴灉',鐢虫姤缁撴灉:'杩涘叆楠屾敹',楠屾敹:'濉啓楠屾敹缁撴灉'})[row.currentPhase]||'闃舵鍔炵悊'}
+const stageDialogTitle=computed(()=>nextStageAction(stageProject.value))
+const stageSubmitText=computed(()=>stageProject.value.currentPhase==='楠屾敹'&&stageForm.acceptanceResult==='PASS'?'楠屾敹閫氳繃骞跺畬鎴愰」鐩�':'淇濆瓨')
+function advanceStage(row){
+ const today=new Date().toISOString().slice(0,10)
+ stageProject.value={...row}
+ Object.assign(stageForm,{applicationDate:today,applicationType:'瀹㈡埛浜や粯',applicationName:row.title||'',expectedFeedbackDate:'',description:'',resultDate:today,resultStatus:'PASS',resultDescription:'',acceptancePlanDate:today,acceptor:row.clientName||'',acceptanceStandard:'',acceptanceDate:today,acceptanceResult:'PASS',acceptanceDescription:''})
+ stageFiles.value=[]
+ stageVisible.value=true
+}
+function normalizedStageFiles(){return stageFiles.value.map(file=>({id:file.id??file.fileId??file.rawData?.id,name:file.name??file.fileName??file.rawData?.originalFilename,url:file.url??file.fileUrl??file.rawData?.url})).filter(file=>file.id||file.url)}
+function stageRemark(phase){
+ if(phase==='寮�鍙�') return `${stageForm.applicationType}锛�${stageForm.applicationName}`
+ if(phase==='鐢虫姤') return `鐢虫姤缁撴灉锛�${({PASS:'閫氳繃',SUPPLEMENT:'闇�瑕佽ˉ鍏�',REJECTED:'鏈�氳繃'})[stageForm.resultStatus]}锛�${stageForm.resultDescription}`
+ if(phase==='鐢虫姤缁撴灉') return `璁″垝楠屾敹锛�${stageForm.acceptancePlanDate}锛涢獙鏀朵汉锛�${stageForm.acceptor}`
+ return `楠屾敹缁撴灉锛�${stageForm.acceptanceResult==='PASS'?'閫氳繃':'闇�瑕佹暣鏀�'}锛�${stageForm.acceptanceDescription}`
+}
+function validateStageForm(phase){
+ if(phase==='寮�鍙�'&&(!stageForm.applicationDate||!stageForm.applicationType||!stageForm.applicationName.trim()||!stageForm.description.trim())) return '璇峰畬鏁村~鍐欑敵鎶ユ棩鏈熴�佺被鍨嬨�佸悕绉板拰璇存槑'
+ if(phase==='鐢虫姤'&&(!stageForm.resultDate||!stageForm.resultStatus||!stageForm.resultDescription.trim())) return '璇峰畬鏁村~鍐欑敵鎶ョ粨鏋滄棩鏈熴�佺粨鏋滃拰璇存槑'
+ if(phase==='鐢虫姤缁撴灉'&&(!stageForm.acceptancePlanDate||!stageForm.acceptor.trim()||!stageForm.acceptanceStandard.trim())) return '璇峰畬鏁村~鍐欓獙鏀舵棩鏈熴�侀獙鏀朵汉鍜岄獙鏀舵爣鍑�'
+ if(phase==='楠屾敹'&&(!stageForm.acceptanceDate||!stageForm.acceptor.trim()||!stageForm.acceptanceResult||!stageForm.acceptanceDescription.trim())) return '璇峰畬鏁村~鍐欓獙鏀舵棩鏈熴�侀獙鏀朵汉銆佺粨鏋滃拰璇存槑'
+}
+async function submitStage(){
+ const phase=stageProject.value.currentPhase
+ const validationMessage=validateStageForm(phase)
+ if(validationMessage) return ElMessage.warning(validationMessage)
+ const common={projectId:stageProject.value.id,formData:{...stageForm},remark:stageRemark(phase),attachments:normalizedStageFiles()}
+ stageSaving.value=true
+ try{
+ if(phase==='寮�鍙�') await transitionProjectStage({...common,targetStage:'鐢虫姤'})
+ else if(phase==='鐢虫姤'&&stageForm.resultStatus==='PASS') await transitionProjectStage({...common,targetStage:'鐢虫姤缁撴灉'})
+ else if(phase==='鐢虫姤') await saveProjectPhase({...common,phaseCode:'APPLICATION',status:'IN_PROGRESS'})
+ else if(phase==='鐢虫姤缁撴灉') await transitionProjectStage({...common,targetStage:'楠屾敹'})
+ else if(phase==='楠屾敹'&&stageForm.acceptanceResult==='PASS') await transitionProjectStage({...common,targetStage:'宸插畬鎴�'})
+ else if(phase==='楠屾敹') await saveProjectPhase({...common,phaseCode:'ACCEPTANCE',status:'IN_PROGRESS'})
+ ElMessage.success(phase==='楠屾敹'&&stageForm.acceptanceResult==='PASS'?'椤圭洰宸查獙鏀跺畬鎴�':'闃舵淇℃伅宸蹭繚瀛�')
+ stageVisible.value=false
+ await load()
+ }finally{stageSaving.value=false}
+}
+async function openLifecycle(row){
+ lifecycleProject.value={...row};lifecycleNodes.value=[];lifecycleVisible.value=true;lifecycleLoading.value=true
+ try{const res=await getProjectLifecycle(row.id);const data=res?.data||{};lifecycleProject.value={...row,...(data.project||{})};lifecycleNodes.value=data.nodes||[]}
+ catch{ElMessage.error('鑾峰彇椤圭洰鐢熷懡鍛ㄦ湡澶辫触')}finally{lifecycleLoading.value=false}
+}
+function formatLifecycleTime(time){return time?String(time).replace('T',' '):'鏃堕棿寰呰褰�'}
+function lifecycleNodeType(status,eventType){return ['RECTIFY','SUPPLEMENT'].includes(eventType)?'warning':eventType==='REJECTED'?'danger':status==='COMPLETED'?'success':status==='CURRENT'?'primary':'info'}
+function lifecycleTagType(status,eventType){return lifecycleNodeType(status,eventType)}
+function lifecycleStatusLabel(status){return status==='COMPLETED'?'宸插畬鎴�':status==='CURRENT'?'杩涜涓�':'寰呰繘琛�'}
function completed(result){ load(); if(result?.startProject&&result?.id) router.push(`/projectManagement/Management/detail/${result.id}`) }
async function remove(row){ await ElMessageBox.confirm(`纭鍒犻櫎椤圭洰鈥�${row.title}鈥濆悧锛焋,'鎻愮ず',{type:'warning'}); await delProject(row.id); ElMessage.success('鍒犻櫎鎴愬姛');load() }
onMounted(load)
</script>
-<style scoped>.app-container{padding:20px}.search-card{margin-bottom:16px}.actions{margin-bottom:14px;text-align:right}</style>
+<style scoped>
+.app-container{padding:20px}.search-card{margin-bottom:16px}.actions{margin-bottom:14px;text-align:right}.operation-dropdown{margin:0 10px}
+.stage-alert{margin-bottom:18px}
+.lifecycle-drawer{min-height:300px;padding:0 6px 24px}.lifecycle-summary{display:grid;gap:10px;margin-bottom:26px;padding:16px;border:1px solid #dbe7fb;border-radius:10px;background:linear-gradient(135deg,#f4f8ff,#fff)}
+.lifecycle-summary div{display:flex;align-items:center;justify-content:space-between;gap:14px}.lifecycle-summary span{color:#909399;font-size:13px}.lifecycle-summary strong{color:#303133;font-size:13px;text-align:right}
+.project-timeline{padding:4px 4px 0 8px}.lifecycle-node{padding:13px 14px;border:1px solid #e4e7ed;border-radius:9px;background:#fff}.lifecycle-node.current{border-color:#9bbaf2;background:#f3f7ff}.lifecycle-node.completed{border-color:#b9dfca;background:#f4fbf7}.lifecycle-node-head{display:flex;align-items:center;justify-content:space-between;gap:12px}.lifecycle-node-head strong{font-size:15px}.lifecycle-node p{margin:9px 0 0;color:#606266;font-size:13px;line-height:1.6}
+.phase-tag.phase-not-started{color:#667085;background:#f2f4f7;border-color:#d0d5dd}.phase-tag.phase-initiation{color:#087f8c;background:#e8f8fa;border-color:#9bd8de}.phase-tag.phase-development{color:#1769e0;background:#eaf3ff;border-color:#aac9f9}.phase-tag.phase-application{color:#c65d00;background:#fff3e6;border-color:#ffc58f}.phase-tag.phase-result{color:#6941c6;background:#f4ebff;border-color:#d6bbfb}.phase-tag.phase-acceptance{color:#087a65;background:#e8f7f2;border-color:#9ad7c8}.phase-tag.phase-completed{color:#21834a;background:#eaf8ef;border-color:#a9ddb9}
+</style>
diff --git a/src/views/projectManagement/Management/projectDetail.vue b/src/views/projectManagement/Management/projectDetail.vue
index c25dabb..e3afd8e 100644
--- a/src/views/projectManagement/Management/projectDetail.vue
+++ b/src/views/projectManagement/Management/projectDetail.vue
@@ -4,11 +4,7 @@
<div class="header-row">
<div><div class="title">{{ info.title || '椤圭洰璇︽儏' }}</div><div class="subtitle">{{ info.no || '-' }} 路 {{ info.source || '鎵嬪姩鍒涘缓' }}</div></div>
<div>
- <el-tag :type="phaseTagType" size="large">{{ info.currentPhase || '鏈紑濮�' }}</el-tag>
- <el-button v-if="info.currentPhase === '鏈紑濮�'" type="primary" @click="openStart">寮�濮嬮」鐩�</el-button>
- <el-button v-if="info.currentPhase === '鏈紑濮�'" @click="openEdit">缂栬緫绔嬮」淇℃伅</el-button>
- <el-button v-else @click="adjustExecutors">璋冩暣椤圭洰鎵ц浜�</el-button>
- <el-button v-if="nextStage" type="success" @click="advanceStage">杩涘叆{{ nextStage }}</el-button>
+ <el-tag class="phase-tag" :class="phaseTagClass(info.currentPhase)" size="large">{{ info.currentPhase || '鏈紑濮�' }}</el-tag>
<el-button @click="router.back()">杩斿洖</el-button>
</div>
</div>
@@ -21,9 +17,10 @@
<el-descriptions-item label="椤圭洰鍒嗙被">{{ info.projectClassification || '-' }}</el-descriptions-item>
<el-descriptions-item label="棰勮寮�濮�">{{ info.planStartTime || '-' }}</el-descriptions-item>
<el-descriptions-item label="棰勮缁撴潫">{{ info.planEndTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯寮�濮�">{{ info.actualStartTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯缁撴潫">{{ info.actualEndTime || '-' }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰璐熻矗浜�">{{ info.projectLeaderName || '-' }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰缁忕悊">{{ (info.projectManagerNames || []).join('銆�') || '-' }}</el-descriptions-item>
- <el-descriptions-item label="椤圭洰鎵ц浜�" :span="2">{{ (info.projectExecutorNames || []).join('銆�') || '-' }}</el-descriptions-item>
<el-descriptions-item label="璺熻繘鍛ㄦ湡">{{ followCycleLabel }}</el-descriptions-item>
<el-descriptions-item label="璺熻繘瑕佹眰" :span="3">{{ info.followDetail || '-' }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰澶囨敞" :span="4">{{ info.remark || '-' }}</el-descriptions-item>
@@ -33,19 +30,16 @@
<el-button v-for="(file,index) in attachments" :key="file.id || index" link type="primary" @click="download(file)">{{ file.name || file.fileName || `闄勪欢${index + 1}` }}</el-button>
</div>
</el-card>
- <el-card shadow="never" class="content-card"><ProjectExecutionPanel v-if="info.id" ref="executionRef" :project-id="info.id" :project-info="info" /></el-card>
- <FormDia ref="formDiaRef" @completed="loadDetail" />
+ <el-card shadow="never" class="content-card"><ProjectExecutionPanel v-if="info.id" ref="executionRef" :project-id="info.id" :project-info="info" readonly /></el-card>
</div>
</template>
<script setup name="ProjectManagementDetail">
import { computed, getCurrentInstance, onMounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage } from 'element-plus'
import { getProject } from '@/api/projectManagement/project'
-import { transitionProjectStage } from '@/api/projectManagement/workflow'
import ProjectExecutionPanel from './components/ProjectExecutionPanel.vue'
-import FormDia from './components/formDia.vue'
const { proxy } = getCurrentInstance()
const route = useRoute()
@@ -53,11 +47,11 @@
const loading = ref(false)
const info = ref({})
const attachments = ref([])
-const formDiaRef = ref()
const executionRef = ref()
const followCycleLabel = computed(() => ({ MONTH: '姣忔湀', QUARTER: '姣忓搴�', YEAR: '姣忓勾' }[info.value.followCycle] || '-'))
-const phaseTagType = computed(() => info.value.currentPhase === '宸插畬鎴�' ? 'success' : info.value.currentPhase === '鏈紑濮�' ? 'info' : 'warning')
-const nextStage = computed(() => ({ '绔嬮」': '鐢虫姤', '寮�鍙�': '鐢虫姤', '鐢虫姤': '鐢虫姤缁撴灉', '鐢虫姤缁撴灉': '楠屾敹', '楠屾敹': '宸插畬鎴�' }[info.value.currentPhase] || ''))
+function phaseTagClass(phase) {
+ return ({ 鏈紑濮�: 'phase-not-started', 绔嬮」: 'phase-initiation', 寮�鍙�: 'phase-development', 鐢虫姤: 'phase-application', 鐢虫姤缁撴灉: 'phase-result', 楠屾敹: 'phase-acceptance', 宸插畬鎴�: 'phase-completed' })[phase] || 'phase-not-started'
+}
async function loadDetail() {
loading.value = true
@@ -69,19 +63,11 @@
await executionRef.value?.refresh?.()
} catch { ElMessage.error('鑾峰彇椤圭洰璇︽儏澶辫触') } finally { loading.value = false }
}
-function openEdit() { formDiaRef.value?.openDialog({ operationType: 'edit', row: { id: info.value.id }, startProject: false }) }
-function openStart() { formDiaRef.value?.openDialog({ operationType: 'edit', row: { id: info.value.id }, startProject: true }) }
-function adjustExecutors() { formDiaRef.value?.openDialog({ operationType: 'edit', row: { id: info.value.id }, personnelOnly: true }) }
-async function advanceStage() {
- await ElMessageBox.confirm(`纭灏嗛」鐩帹杩涘埌鈥�${nextStage.value}鈥濆悧锛焋, '椤圭洰闃舵鎺ㄨ繘', { type: 'warning' })
- await transitionProjectStage({ projectId: info.value.id, targetStage: nextStage.value })
- ElMessage.success(`宸茶繘鍏�${nextStage.value}闃舵`)
- await loadDetail()
-}
function download(file) { if (!file?.url) return ElMessage.warning('闄勪欢鏆傛棤涓嬭浇鍦板潃'); proxy.$download.byUrl(file.url, file.name || file.fileName) }
onMounted(loadDetail)
</script>
<style scoped>
.app-container { padding: 20px; }.header-card,.content-card { margin-bottom: 16px; }.header-row { display:flex;align-items:center;justify-content:space-between;gap:16px; }.title { font-size:22px;font-weight:600;color:#1f2d3d; }.subtitle { margin-top:6px;color:#909399; }.header-row>div:last-child { display:flex;align-items:center;gap:10px; }.attachment-block { margin-top:18px; }.section-title { margin-bottom:10px;font-weight:600; }
+.phase-tag.phase-not-started{color:#667085;background:#f2f4f7;border-color:#d0d5dd}.phase-tag.phase-initiation{color:#087f8c;background:#e8f8fa;border-color:#9bd8de}.phase-tag.phase-development{color:#1769e0;background:#eaf3ff;border-color:#aac9f9}.phase-tag.phase-application{color:#c65d00;background:#fff3e6;border-color:#ffc58f}.phase-tag.phase-result{color:#6941c6;background:#f4ebff;border-color:#d6bbfb}.phase-tag.phase-acceptance{color:#087a65;background:#e8f7f2;border-color:#9ad7c8}.phase-tag.phase-completed{color:#21834a;background:#eaf8ef;border-color:#a9ddb9}
</style>
diff --git a/src/views/safeProduction/safeWorkApproval/fileList.vue b/src/views/safeProduction/safeWorkApproval/fileList.vue
index c3b7597..880de7b 100644
--- a/src/views/safeProduction/safeWorkApproval/fileList.vue
+++ b/src/views/safeProduction/safeWorkApproval/fileList.vue
@@ -5,7 +5,6 @@
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="downLoadFile(scope.row)">涓嬭浇</el-button>
- <el-button link type="primary" size="small" @click="lookFile(scope.row)">棰勮</el-button>
<el-button link type="danger" size="small" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -64,4 +63,4 @@
})
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/salesManagement/salesLedger/fileList.vue b/src/views/salesManagement/salesLedger/fileList.vue
index eb4d401..8c29e9b 100644
--- a/src/views/salesManagement/salesLedger/fileList.vue
+++ b/src/views/salesManagement/salesLedger/fileList.vue
@@ -5,7 +5,6 @@
<el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
<template #default="scope">
<el-button link type="primary" @click="downLoadFile(scope.row)">涓嬭浇</el-button>
- <el-button link type="primary" @click="lookFile(scope.row)">棰勮</el-button>
</template>
</el-table-column>
</el-table>
@@ -40,4 +39,4 @@
})
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index f6b78fc..7445125 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -210,6 +210,37 @@
</el-tag>
</template>
</el-table-column>
+ <el-table-column label="鍏宠仈椤圭洰" width="290" align="left">
+ <template #default="scope">
+ <div
+ v-if="scope.row.projectManagementInfoId"
+ class="business-project-cell"
+ @click="openProjectProgress(scope.row)"
+ >
+ <div class="business-project-cell__head">
+ <span class="business-project-cell__name">
+ {{ scope.row.linkedProjectName || scope.row.projectName || "鍏宠仈椤圭洰" }}
+ </span>
+ <el-tag
+ size="small"
+ effect="light"
+ :type="projectPhaseTagType(scope.row.projectCurrentPhase)"
+ >
+ {{ scope.row.projectCurrentPhase || "鏈紑濮�" }}
+ </el-tag>
+ </div>
+ <el-progress
+ :percentage="Number(scope.row.projectProgress || 0)"
+ :stroke-width="7"
+ />
+ <div class="business-project-cell__meta">
+ 妯″潡 {{ scope.row.projectCompletedModuleCount || 0 }}/{{ scope.row.projectModuleCount || 0 }}锛�
+ 璐熻矗浜猴細{{ scope.row.projectLeaderName || "鏈缃�" }}
+ </div>
+ </div>
+ <el-tag v-else type="info" effect="plain">鏆傛湭鐢熸垚椤圭洰</el-tag>
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="500" align="center">
<template #default="scope">
<el-button link type="primary" @click="openForm('view', scope.row)"
@@ -248,7 +279,7 @@
link
type="primary"
@click="openProjectProgress(scope.row)"
- >鏌ョ湅椤圭洰杩涘害
+ >椤圭洰姒傚喌
</el-button>
<el-button
v-if="![1, 2].includes(scope.row.businessApprovalStatus)"
@@ -1297,6 +1328,112 @@
</template>
</el-table>
</el-dialog>
+
+ <el-drawer
+ v-model="projectOverviewVisible"
+ title="鍏宠仈椤圭洰杩涘害涓庢儏鍐�"
+ size="720px"
+ destroy-on-close
+ >
+ <div v-loading="projectOverviewLoading" class="project-overview">
+ <template v-if="projectOverviewRow">
+ <div class="project-overview__hero">
+ <div>
+ <div class="project-overview__title">
+ {{ projectOverviewRow.linkedProjectName || projectOverviewRow.projectName }}
+ </div>
+ <div class="project-overview__no">
+ {{ projectOverviewRow.projectNo || "鏆傛棤椤圭洰缂栧彿" }}
+ </div>
+ </div>
+ <el-tag
+ size="large"
+ :type="projectPhaseTagType(projectOverviewRow.projectCurrentPhase)"
+ >
+ {{ projectOverviewRow.projectCurrentPhase || "鏈紑濮�" }}
+ </el-tag>
+ </div>
+
+ <div class="project-overview__progress-card">
+ <div class="project-overview__progress-title">
+ <span>椤圭洰鎬昏繘搴�</span>
+ <strong>{{ Number(projectOverviewRow.projectProgress || 0) }}%</strong>
+ </div>
+ <el-progress
+ :percentage="Number(projectOverviewRow.projectProgress || 0)"
+ :stroke-width="12"
+ :show-text="false"
+ />
+ </div>
+
+ <el-descriptions :column="2" border class="project-overview__descriptions">
+ <el-descriptions-item label="椤圭洰璐熻矗浜�">
+ {{ projectOverviewRow.projectLeaderName || "鏈缃�" }}
+ </el-descriptions-item>
+ <el-descriptions-item label="妯″潡瀹屾垚">
+ {{ projectOverviewRow.projectCompletedModuleCount || 0 }} /
+ {{ projectOverviewRow.projectModuleCount || 0 }}
+ </el-descriptions-item>
+ <el-descriptions-item label="璁″垝鍛ㄦ湡">
+ {{ formatProjectDate(projectOverviewRow.projectPlanStartTime) }} 鑷�
+ {{ formatProjectDate(projectOverviewRow.projectPlanEndTime) }}
+ </el-descriptions-item>
+ <el-descriptions-item label="瀹為檯鍛ㄦ湡">
+ {{ formatProjectDate(projectOverviewRow.projectActualStartTime) }} 鑷�
+ {{ formatProjectDate(projectOverviewRow.projectActualEndTime) }}
+ </el-descriptions-item>
+ </el-descriptions>
+
+ <div class="project-overview__section-title">椤圭洰鑺傜偣</div>
+ <div class="project-overview__nodes">
+ <div
+ v-for="node in projectCoreLifecycleNodes"
+ :key="node.code"
+ class="project-overview__node"
+ :class="'is-' + String(node.status || 'PENDING').toLowerCase()"
+ >
+ <span class="project-overview__node-dot"></span>
+ <span class="project-overview__node-name">{{ node.name }}</span>
+ <span class="project-overview__node-time">
+ {{ node.time ? formatProjectDate(node.time) : "寰呰繘琛�" }}
+ </span>
+ </div>
+ </div>
+
+ <div class="project-overview__section-title">妯″潡杩涘害</div>
+ <el-table :data="projectOverview.modules || []" border size="small">
+ <el-table-column prop="moduleName" label="妯″潡" min-width="150" />
+ <el-table-column prop="projectWeight" label="椤圭洰鍗犳瘮" width="100" align="center">
+ <template #default="scope">{{ Number(scope.row.projectWeight || 0) }}%</template>
+ </el-table-column>
+ <el-table-column label="褰撳墠杩涘害" min-width="170">
+ <template #default="scope">
+ <el-progress :percentage="Number(scope.row.currentProgress || 0)" :stroke-width="8" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="reportCount" label="姹囨姤娆℃暟" width="90" align="center" />
+ </el-table>
+
+ <div class="project-overview__section-title">鏈�杩戝姩鎬�</div>
+ <el-timeline v-if="projectRecentActivities.length">
+ <el-timeline-item
+ v-for="item in projectRecentActivities"
+ :key="item.key"
+ :timestamp="item.time"
+ placement="top"
+ >
+ <strong>{{ item.title }}</strong>
+ <div class="project-overview__activity-detail">{{ item.detail }}</div>
+ </el-timeline-item>
+ </el-timeline>
+ <el-empty v-else description="鏆傛棤璺熻繘鎴栨眹鎶ヨ褰�" :image-size="70" />
+
+ <div class="project-overview__footer">
+ <el-button type="primary" @click="openProjectDetail">杩涘叆椤圭洰璇︽儏</el-button>
+ </div>
+ </template>
+ </div>
+ </el-drawer>
</div>
</template>
@@ -1340,6 +1477,10 @@
productionPlanCombine,
productionPlanListPage,
} from "@/api/productionPlan/productionPlan.js";
+import {
+ getProjectWorkflow,
+ getProjectLifecycle,
+} from "@/api/projectManagement/workflow.js";
const FileList = defineAsyncComponent(() =>
import("@/components/Dialog/FileList.vue")
@@ -1367,6 +1508,36 @@
const businessActionId = ref(null);
const fileList = ref([]);
const deliveryFileList = ref([]);
+const projectOverviewVisible = ref(false);
+const projectOverviewLoading = ref(false);
+const projectOverviewRow = ref(null);
+const projectOverview = ref({ modules: [], followUps: [], reports: [] });
+const projectLifecycle = ref({ nodes: [] });
+const projectRecentActivities = computed(() => {
+ const follows = (projectOverview.value.followUps || []).map((item) => ({
+ key: "follow-" + item.id,
+ time: item.followDate || item.createTime || "",
+ title: "椤圭洰璺熻繘",
+ detail: item.detail || "宸插~鍐欓」鐩窡杩�",
+ }));
+ const reports = (projectOverview.value.reports || []).map((item) => ({
+ key: "report-" + item.id,
+ time: item.reportDate || item.createTime || "",
+ title: (item.moduleName || "椤圭洰妯″潡") + "杩涘害姹囨姤",
+ detail:
+ (item.reporterNames || "") +
+ " 姹囨姤鑷� " +
+ Number(item.progress || 0) +
+ "%" +
+ (item.remark ? "锛�" + item.remark : ""),
+ }));
+ return [...follows, ...reports]
+ .sort((a, b) => String(b.time).localeCompare(String(a.time)))
+ .slice(0, 6);
+});
+const projectCoreLifecycleNodes = computed(() =>
+ (projectLifecycle.value.nodes || []).filter((item) => !item.eventType)
+);
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
@@ -3030,14 +3201,56 @@
fileDialogVisible.value = true;
};
-// 鏌ョ湅椤圭洰杩涘害锛堣烦杞」鐩鎯咃紝鍙煡鐪嬮樁娈佃繘灞曚笌璧勬枡鏂囦欢锛�
-const openProjectProgress = (row) => {
+const projectPhaseTagType = (phase) => {
+ const types = {
+ 鏈紑濮�: "info",
+ 绔嬮」: "warning",
+ 寮�鍙�: "primary",
+ 鐢虫姤: "warning",
+ 鐢虫姤缁撴灉: "success",
+ 楠屾敹: "success",
+ 宸插畬鎴�: "success",
+ };
+ return types[phase] || "info";
+};
+
+const formatProjectDate = (value) => {
+ if (!value) return "鏈褰�";
+ const date = dayjs(value);
+ return date.isValid() ? date.format("YYYY-MM-DD") : value;
+};
+
+// 鍦ㄤ笟鍔$鐞嗗唴鏌ョ湅鍏宠仈椤圭洰鐨勯樁娈点�佽繘搴︺�佹ā鍧楀拰鏈�杩戝姩鎬併��
+const openProjectProgress = async (row) => {
const projectId = row.projectManagementInfoId || row.projectId;
if (!projectId) {
proxy.$modal.msgWarning("璇ヤ笟鍔℃殏鏈叧鑱旈」鐩�");
return;
}
- router.push(`/projectManagement/Management/detail/${projectId}`);
+ projectOverviewRow.value = row;
+ projectOverview.value = { modules: [], followUps: [], reports: [] };
+ projectLifecycle.value = { nodes: [] };
+ projectOverviewVisible.value = true;
+ projectOverviewLoading.value = true;
+ try {
+ const [workflowRes, lifecycleRes] = await Promise.all([
+ getProjectWorkflow(projectId),
+ getProjectLifecycle(projectId),
+ ]);
+ projectOverview.value = workflowRes.data || {};
+ projectLifecycle.value = lifecycleRes.data || {};
+ } finally {
+ projectOverviewLoading.value = false;
+ }
+};
+
+const openProjectDetail = () => {
+ const projectId =
+ projectOverviewRow.value?.projectManagementInfoId ||
+ projectOverviewRow.value?.projectId;
+ if (!projectId) return;
+ projectOverviewVisible.value = false;
+ router.push("/projectManagement/Management/detail/" + projectId);
};
// 鎵撳紑鍙戣揣寮规
@@ -3714,6 +3927,162 @@
}
}
+.business-project-cell {
+ cursor: pointer;
+ padding: 3px 0;
+
+ &__head {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 8px;
+ margin-bottom: 4px;
+ }
+
+ &__name {
+ overflow: hidden;
+ font-weight: 600;
+ color: #1f3b68;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ &__meta {
+ margin-top: 2px;
+ font-size: 12px;
+ color: #7a8699;
+ }
+
+ :deep(.el-progress__text) {
+ min-width: 38px;
+ font-size: 12px !important;
+ }
+}
+
+.project-overview {
+ padding: 0 4px 24px;
+
+ &__hero,
+ &__progress-title,
+ &__footer {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ &__hero {
+ padding: 18px 20px;
+ margin-bottom: 14px;
+ background: linear-gradient(135deg, #eef5ff, #f7faff);
+ border: 1px solid #dce9fb;
+ border-radius: 10px;
+ }
+
+ &__title {
+ margin-bottom: 5px;
+ font-size: 20px;
+ font-weight: 700;
+ color: #1f2d3d;
+ }
+
+ &__no,
+ &__activity-detail {
+ font-size: 13px;
+ color: #7a8699;
+ }
+
+ &__progress-card {
+ padding: 16px 20px;
+ margin-bottom: 14px;
+ background: #fff;
+ border: 1px solid #e5eaf1;
+ border-radius: 10px;
+ }
+
+ &__progress-title {
+ margin-bottom: 10px;
+
+ strong {
+ font-size: 22px;
+ color: var(--el-color-primary);
+ }
+ }
+
+ &__descriptions {
+ margin-bottom: 20px;
+ }
+
+ &__section-title {
+ padding-left: 10px;
+ margin: 22px 0 12px;
+ font-size: 16px;
+ font-weight: 700;
+ border-left: 4px solid var(--el-color-primary);
+ }
+
+ &__nodes {
+ display: grid;
+ grid-template-columns: repeat(4, minmax(0, 1fr));
+ gap: 8px;
+ }
+
+ &__node {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ min-width: 0;
+ padding: 9px 10px;
+ color: #8a94a6;
+ background: #f7f8fa;
+ border: 1px solid #e8ebf0;
+ border-radius: 8px;
+
+ &.is-current {
+ color: #1d5ec7;
+ background: #edf5ff;
+ border-color: #a9ccff;
+ }
+
+ &.is-completed {
+ color: #168464;
+ background: #effaf6;
+ border-color: #a9dfce;
+ }
+ }
+
+ &__node-dot {
+ flex: 0 0 auto;
+ width: 7px;
+ height: 7px;
+ background: currentColor;
+ border-radius: 50%;
+ }
+
+ &__node-name {
+ overflow: hidden;
+ font-size: 13px;
+ font-weight: 600;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ &__node-time {
+ margin-left: auto;
+ font-size: 11px;
+ white-space: nowrap;
+ }
+
+ &__activity-detail {
+ margin-top: 5px;
+ line-height: 1.6;
+ }
+
+ &__footer {
+ justify-content: flex-end;
+ padding-top: 18px;
+ }
+}
+
@media print {
.app-container {
display: none;
--
Gitblit v1.9.3