From 527efb36f35b471710e445972673abff45bacdac Mon Sep 17 00:00:00 2001 From: 董国庆 <364620639@qq.com> Date: 星期五, 12 九月 2025 17:36:09 +0800 Subject: [PATCH] 401跳转登录 --- laboratory/src/views/reportLibrary/projectProposalLibrary/components/approval/index.vue | 87 +++++++++++++++++++++++++------------------ 1 files changed, 50 insertions(+), 37 deletions(-) diff --git a/laboratory/src/views/reportLibrary/projectProposalLibrary/components/approval/index.vue b/laboratory/src/views/reportLibrary/projectProposalLibrary/components/approval/index.vue index 18920a5..8328e36 100644 --- a/laboratory/src/views/reportLibrary/projectProposalLibrary/components/approval/index.vue +++ b/laboratory/src/views/reportLibrary/projectProposalLibrary/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" - @close="handleClose"> - <div class="approval-dialog" :style="{height: obj.isDetail ? '50vh' : '40vh'}"> + <el-dialog :title="dialogTitle" :visible.sync="visible" width="90%" top="5vh" @open="open" po + :close-on-click-modal="false" @close="handleClose"> + <div class="approval-dialog" :style="{ height: obj.isDetail ? '80vh' : '60vh' }"> <!-- 左侧审批内容 --> <div class="approval-content"> <Card class="approval-content-card"> @@ -58,15 +58,15 @@ </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="#" :file-list="fileList" disabled> - </el-upload> - </el-form-item> + <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="#" :file-list="fileList" :on-preview="handlePreview" disabled> + </el-upload> + </el-form-item> </el-form> </template> @@ -106,7 +106,7 @@ </div> <div slot="footer" class="dialog-footer"> - <el-button @click="handleClose">{{obj.isDetail ? '关闭' : '取 消'}}</el-button> + <el-button @click="handleClose">{{ obj.isDetail ? '关闭' : '取 消' }}</el-button> <el-button type="primary" @click="handleApprove" v-if="!obj.isDetail">确定</el-button> </div> </el-dialog> @@ -116,7 +116,8 @@ import ApprovalProcess from '@/components/approvalProcess' import AiEditor from '@/components/AiEditor' import { getDetail } from '../../service'; -import { customUploadRequest, getFullUrl } from "@/utils/utils"; +import { customUploadRequest, getFullUrl, getAllocateIp } from "@/utils/utils"; +import apiConfig from '@/utils/baseurl'; export default { @@ -173,6 +174,17 @@ }, methods: { getFullUrl, + handlePreview(file) { + console.log('url', file) + if (file && file.url) { + if (file.url && file.url.startsWith(getAllocateIp())) { + window.open(file.url, '_blank'); + } else { + let newUrl = getAllocateIp() + file.url; + window.open(newUrl, '_blank'); + } + } + }, open() { if (!this.obj.id) { this.$message.error('缺少必要参数'); @@ -187,22 +199,22 @@ 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 = []; - } + 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 || '' }] : @@ -276,10 +288,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); @@ -287,9 +300,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; @@ -313,7 +326,7 @@ } .approval-content-card { - height: calc(100% - 100px) !important; + height: calc(100% - 10px) !important; box-shadow: none !important; } @@ -392,7 +405,7 @@ } .approval-dialog-approve { - padding: 38px 20px; + padding: 18px 10px; // display: flex; align-content: center; -- Gitblit v1.7.1