From df4ac9fbcf28e1f38df70242f1afb9e5be056a69 Mon Sep 17 00:00:00 2001 From: 董国庆 <364620639@qq.com> Date: 星期一, 08 九月 2025 11:30:15 +0800 Subject: [PATCH] 提交代码-修改审批状态判断 --- laboratory/src/views/reportLibrary/processDevelopment/components/approval/index.vue | 62 ++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 9 deletions(-) diff --git a/laboratory/src/views/reportLibrary/processDevelopment/components/approval/index.vue b/laboratory/src/views/reportLibrary/processDevelopment/components/approval/index.vue index ca97986..32f2e2f 100644 --- a/laboratory/src/views/reportLibrary/processDevelopment/components/approval/index.vue +++ b/laboratory/src/views/reportLibrary/processDevelopment/components/approval/index.vue @@ -1,7 +1,7 @@ <template> - <el-dialog :title="dialogTitle" :visible.sync="visible" width="80%" @open="open" po :close-on-click-modal="false" + <el-dialog :title="dialogTitle" :visible.sync="visible" width="90%" @open="open" top="5vh" :close-on-click-modal="false" @close="handleClose"> - <div class="approval-dialog" :style="{height: obj.isDetail ? '50vh' : '40vh'}"> + <div class="approval-dialog" :style="{height: obj.isDetail ? '80vh' : '60vh'}"> <!-- 左侧审批内容 --> <div class="approval-content"> <Card class="approval-content-card"> @@ -56,6 +56,16 @@ <ai-editor :readOnly="true" :value="form.reportText" style="width: 100%;" placeholder="请输入报告正文" /> </el-form-item> + <div class="header-title" style="width: 100%"> + <div class="header-title-left"> + <img src="@/assets/public/headercard.png" /> + <div>附件</div> + </div> + </div> + <el-form-item prop="name" style="margin-top: -18px"> + <el-upload action="#" :on-preview="handlePreview":file-list="fileList" disabled> + </el-upload> + </el-form-item> </el-form> </template> @@ -105,6 +115,8 @@ import ApprovalProcess from '@/components/approvalProcess' import AiEditor from '@/components/AiEditor' import { getDetail } from '../../service'; +import { customUploadRequest, getFullUrl } from "@/utils/utils"; +import apiConfig from '@/utils/baseurl'; export default { @@ -144,8 +156,10 @@ updateBy: "", auditRemark: "", auditPersonName: "", + feasibilityReportFiles: [], auditTime: "" }, + fileList: [], tableData: [], rules: {}, status: "2", @@ -158,6 +172,18 @@ }, }, methods: { + getFullUrl, + handlePreview(file) { + console.log('url', file) + if (file && file.url) { + if (file.url && file.url.startsWith(apiConfig.showImgUrl)) { + window.open(file.url, '_blank'); + }else{ + let newUrl=apiConfig.showImgUrl+file.url; + window.open(newUrl, '_blank'); + } + } + }, open() { if (!this.obj.id) { this.$message.error('缺少必要参数'); @@ -171,6 +197,23 @@ ...data, processData: [] }; + if ( + data.feasibilityReportFiles && + data.feasibilityReportFiles.length > 0 + ) { + this.fileList = + data.feasibilityReportFiles.map((file) => { + return { + name: file.fileName, + url: getFullUrl(file.fileUrl), + uid: file.id, + }; + }); + this.form.feasibilityReportFiles =data.feasibilityReportFiles; + } else { + this.fileList = []; + this.form.feasibilityReportFiles = []; + } this.tableData = data.projectTeam ? [{ ...data.projectTeam, staffName: data.staffNames || '' }] : @@ -265,10 +308,11 @@ .approval-dialog { display: flex; - height: 40vh; + min-height: 60vh; + max-height: 80vh; .approval-content { - flex: 3; + flex: 1; margin-right: 20px; background: #ffffff; box-shadow: 0px 4px 12px 4px rgba(0, 0, 0, 0.08); @@ -276,9 +320,9 @@ } .approval-flow { - padding: 40px 20px; - // width: 405px; - flex: 2; + padding: 20px 10px; + width: 305px; + // flex: 2; background: #ffffff; box-shadow: 0px 4px 12px 4px rgba(0, 0, 0, 0.08); border-radius: 10px; @@ -302,7 +346,7 @@ } .approval-content-card { - height: calc(100% - 100px) !important; + height: calc(100% - 10px) !important; box-shadow: none !important; } @@ -381,7 +425,7 @@ } .approval-dialog-approve { - padding: 38px 20px; + padding: 18px 10px; // display: flex; align-content: center; -- Gitblit v1.7.1