From 0d35b189aa9272437f9d6a98f27b3952d8d2bf1e Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期五, 11 四月 2025 14:08:24 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
src/views/deliveryAssessment/taskList/components/AssessmentDialog.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/views/deliveryAssessment/taskList/components/AssessmentDialog.vue b/src/views/deliveryAssessment/taskList/components/AssessmentDialog.vue
index 31f8a8b..e7eb9d8 100644
--- a/src/views/deliveryAssessment/taskList/components/AssessmentDialog.vue
+++ b/src/views/deliveryAssessment/taskList/components/AssessmentDialog.vue
@@ -16,15 +16,15 @@
</el-form>
<div class="content-box">
<el-row :gutter="16">
- <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6">
+ <el-col :xs="24" :sm="24" :md="4" :lg="4" :xl="4">
<div class="content-box-left">
<div class="content-box-left-th">设立课题规则</div>
- <div class="content-box-left-body">
+ <div class="content-box-left-body" :style="{ height: `calc(${$baseTableHeight()}px - 40px)`}">
1、根据可研报告、产品构思设计的工艺研究路线，一条工艺路线设立一个课题。如果一个课题中有多个化合物需要开发研究，则每个化合物作为一个分题；分题归集到该课题中，最终形成课题报告。不同课题报告中的分题不能重复使用。
2、在可行研究阶段，工艺开发升级，重新规划工艺研究路线，则以新规划的工艺路线方案来设定课题</div>
</div>
</el-col>
- <el-col style="margin-top: 5px;" :xs="24" :sm="24" :md="18" :lg="18" :xl="18">
+ <el-col style="margin-top: 5px;" :xs="24" :sm="24" :md="19" :lg="19" :xl="19">
<Table :total="0" :data="criteriaList" show-summary :summary-method="getSummaries"
:span-method="arraySpanMethod">
<el-table-column type="index" label="序号" width="80" />
@@ -60,6 +60,10 @@
</el-col>
</el-row>
</div>
+ <div class="assessed">
+ <div>评定时间：2025-2-20 11:08:00</div>
+ <div>评定人：张三</div>
+ </div>
<template #footer>
<span class="dialog-footer select-member-footer">
<el-button type="primary" @click="handleSubmit">提交评定结果</el-button>
@@ -78,7 +82,7 @@
},
reportData: {
type: Object,
- default: () => ({})
+ default: () => { }
}
},
data() {
@@ -225,10 +229,17 @@
}
&-body {
- flex: 1;
padding: 0 10px;
line-height: 23px;
}
}
}
+
+.assessed {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ gap: 25px;
+ margin-top: 20px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.7.1