From 7ef2454c7df85c9a8fd493552398d4ac07c460d4 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期一, 23 六月 2025 09:43:56 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/chemistQa/projectTesting/components/approval/index.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/laboratory/src/views/chemistQa/projectTesting/components/approval/index.vue b/laboratory/src/views/chemistQa/projectTesting/components/approval/index.vue
index 3e317fc..6c6d0b1 100644
--- a/laboratory/src/views/chemistQa/projectTesting/components/approval/index.vue
+++ b/laboratory/src/views/chemistQa/projectTesting/components/approval/index.vue
@@ -72,7 +72,7 @@
</div>
</div>
</div>
- <div class="approval-dialog-approve" v-if="type === 'approve'">
+ <div class="approval-dialog-approve" v-if="type === 'approve'">
<el-row :span="24">
<el-col :span="12">
<div class="status">
@@ -107,7 +107,7 @@
<script>
import ApprovalProcess from '@/components/approvalProcess'
import AiEditor from '@/components/AiEditor'
-import { getDetailInfo, getDetail,detailAuditReport } from '../../service'
+import { getDetailInfo, getDetail, detailAuditReport } from '../../service'
export default {
name: "ApprovalDialog",
@@ -142,7 +142,7 @@
processData: [],
},
tableData: [],
- fileList:[],
+ fileList: [],
radio1: 1,
rules: {},
status: "1",
@@ -172,7 +172,17 @@
getDetailInfo({ id: this.data.id }).then(res => {
if (res) {
this.form = { ...res, reportContent: Number(res.reportContent), processData: [] }
- this.fileList = res.qaReportFileList
+ if (res.qaReportFileList && res.qaReportFileList.length > 0) {
+ this.fileList = res.qaReportFileList.map(file => ({
+ name: file.fileName,
+ url: getFullUrl(file.fileUrl),
+ uid: file.id
+ }))
+ this.form.qaReportFileList = res.fileList
+ } else {
+ this.fileList = []
+ this.form.qaReportFileList = []
+ }
// 组装流程数据
let processData = [];
// 提交节点
@@ -228,13 +238,13 @@
getDetail() {
getDetail(this.data.itemId).then(res => {
if (res) {
- this.tableData = [{...res,teamName:res.projectTeamVO.teamName}]
+ this.tableData = [{ ...res, teamName: res.projectTeamVO.teamName }]
}
})
},
handleClose() {
this.$emit("close");
-
+
this.form.approvalComment = "";
},
handleApprove() {
--
Gitblit v1.7.1