From b7ec20b3ec22c858f2db3d9285c5e9d38bd8a48f Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 08 五月 2025 16:17:19 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/schemeManagement/list.vue | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 155 insertions(+), 3 deletions(-)
diff --git a/laboratory/src/views/dataManagement/schemeManagement/list.vue b/laboratory/src/views/dataManagement/schemeManagement/list.vue
index b8a3944..d8941e1 100644
--- a/laboratory/src/views/dataManagement/schemeManagement/list.vue
+++ b/laboratory/src/views/dataManagement/schemeManagement/list.vue
@@ -127,7 +127,37 @@
createTime: '2024-03-15',
status: 'pending',
approver: '李四',
- approveTime: '2024-03-16'
+ approveTime: '2024-03-16',
+ purpose: '<p>1. 研究新型催化剂的性能</p><p>2. 优化反应条件</p><p>3. 提高产品收率</p>',
+ processParameters: [
+ {
+ '工艺参数': '反应温度',
+ '参数值': '25℃',
+ '操作人员': ['1', '2'],
+ updateTime: '2024-01-01 12:00:00'
+ },
+ {
+ '工艺参数': '反应压力',
+ '参数值': '1.0MPa',
+ '操作人员': ['3'],
+ updateTime: '2024-01-01 12:00:00'
+ }
+ ],
+ materials: [
+ {
+ '材料名称': '催化剂A',
+ '规格': '工业级',
+ '数量': '100g',
+ updateTime: '2024-01-01 12:00:00'
+ },
+ {
+ '材料名称': '溶剂B',
+ '规格': '分析纯',
+ '数量': '500ml',
+ updateTime: '2024-01-01 12:00:00'
+ }
+ ],
+ steps: '<p>1. 准备工作</p><p>2. 设备检查</p><p>3. 实验操作</p><p>4. 数据记录</p>'
},
{
planCode: 'PLAN-2024-002',
@@ -139,7 +169,25 @@
createTime: '2024-03-14',
status: 'approved',
approver: '赵六',
- approveTime: '2024-03-15'
+ approveTime: '2024-03-15',
+ purpose: '<p>1. 评估现有安全管理制度</p><p>2. 制定新的安全规范</p><p>3. 进行安全培训</p>',
+ processParameters: [
+ {
+ '工艺参数': '培训时间',
+ '参数值': '2小时',
+ '操作人员': ['1', '2', '3'],
+ updateTime: '2024-01-01 12:00:00'
+ }
+ ],
+ materials: [
+ {
+ '材料名称': '培训材料',
+ '规格': 'A4',
+ '数量': '50份',
+ updateTime: '2024-01-01 12:00:00'
+ }
+ ],
+ steps: '<p>1. 安全评估</p><p>2. 制度更新</p><p>3. 人员培训</p><p>4. 效果评估</p>'
},
{
planCode: 'PLAN-2024-003',
@@ -261,9 +309,113 @@
console.log("删除数据：", row);
},
handleDetail(row) {
- this.currentApprovalData = row;
+ // 打开弹窗
this.approvalDialogType = 'view';
this.approvalDialogVisible = true;
+
+ // 调用获取详情接口
+ this.getPlanDetail(row.planCode);
+ },
+ // 获取方案详情
+ async getPlanDetail(planCode) {
+ try {
+ // TODO: 替换为实际的接口调用
+ // const { data } = await this.$api.getPlanDetail({ planCode });
+
+ // 模拟接口返回数据
+ const mockDetailData = {
+ planCode: planCode,
+ planName: '2024年度实验室设备升级方案',
+ stage: '设备升级实验',
+ testDate: '2024-03-15',
+ testTime: '2024-03-15 14:00:00',
+ tester: '张三',
+ creator: '张三',
+ createTime: '2024-03-15',
+ status: 'pending',
+ approver: '李四',
+ approveTime: '2024-03-16',
+ experimentPurpose: [
+ {
+ id: 1,
+ type: 'richText',
+ data: {
+ content: '<p>1. 研究新型催化剂的性能</p><p>2. 优化反应条件</p><p>3. 提高产品收率</p>'
+ }
+ }
+ ],
+ processParameters: [
+ {
+ id: 2,
+ type: 'customTable',
+ data: {
+ headers: [
+ { name: '工艺参数', type: 'text' },
+ { name: '参数值', type: 'text' },
+ { name: '操作人员', type: 'user' }
+ ],
+ rows: [
+ {
+ '工艺参数': '反应温度',
+ '参数值': '25℃',
+ '操作人员': ['1', '2'],
+ updateTime: '2024-01-01 12:00:00'
+ },
+ {
+ '工艺参数': '反应压力',
+ '参数值': '1.0MPa',
+ '操作人员': ['3'],
+ updateTime: '2024-01-01 12:00:00'
+ }
+ ]
+ }
+ }
+ ],
+ materialsAndEquipment: [
+ {
+ id: 3,
+ type: 'customTable',
+ data: {
+ headers: [
+ { name: '材料名称', type: 'text' },
+ { name: '规格', type: 'text' },
+ { name: '数量', type: 'text' }
+ ],
+ rows: [
+ {
+ '材料名称': '催化剂A',
+ '规格': '工业级',
+ '数量': '100g',
+ updateTime: '2024-01-01 12:00:00'
+ },
+ {
+ '材料名称': '溶剂B',
+ '规格': '分析纯',
+ '数量': '500ml',
+ updateTime: '2024-01-01 12:00:00'
+ }
+ ]
+ }
+ }
+ ],
+ operationSteps: [
+ {
+ id: 4,
+ type: 'richText',
+ data: {
+ content: '<p>1. 准备工作</p><p>2. 设备检查</p><p>3. 实验操作</p><p>4. 数据记录</p>'
+ }
+ }
+ ]
+ };
+
+ // 更新弹窗数据
+ this.currentApprovalData = mockDetailData;
+ } catch (error) {
+ console.error('获取方案详情失败：', error);
+ this.$message.error('获取方案详情失败');
+ this.approvalDialogVisible = false;
+ }
},
handleTypeChange(type) {
this.currentType = type;
--
Gitblit v1.7.1