From 64fd3303e672c002ebdbf572e641301343702c5b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 18 六月 2024 10:23:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index dba05cf..926d1b5 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -225,6 +225,7 @@
<editFactoryChange ref="editFactoryChange" @success="successEvent" />
<!-- 鎶曚繚璇︽儏 -->
<insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
+ <OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -242,6 +243,7 @@
import applyReturn from '@/components/enterprise/applyReturn'
import add_subtract_return from '@/components/enterprise/add_subtract_return'
// import insuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import {
getDetail,
getChangeDetail,
@@ -258,6 +260,7 @@
extends: BaseOpera,
components: {
GlobalWindow,
+ OperaPdfViewerWindow,
ApplyChangeUnitDetails,
OperaApplyChangeUnitCheckWindow,
applyReturn,
@@ -429,14 +432,16 @@
this.$tip.apiFailed(err)
})
},
- viewApplyFile () {
- if (this.model.applyUnitFile && this.model.applyUnitFile.fileurlFull) {
- window.open(this.model.applyUnitFile.fileurlFull)
+ viewApplyFile(){
+ if(this.model.applyUnitFile && this.model.applyUnitFile.fileurlFull){
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鐢宠鍗�',this.model.applyUnitFile.fileurlFull)
+ // window.open(this.model.applyFile.fileurlFull)
}
},
- viewPidan () {
- if (this.model.pidanFile && this.model.pidanFile.fileurlFull) {
- window.open(this.model.pidanFile.fileurlFull)
+ viewPidan(){
+ if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎵瑰崟',this.model.pidanFile.fileurlFull)
+ // window.open(this.model.pidanFile.fileurlFull)
}
},
handleSizeChange (val) {
--
Gitblit v1.9.3