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/OperaWtbApplyShopWindow.vue |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 35b3080..a1b815a 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -85,6 +85,7 @@
                             align="center"
                             label="鎶曚繚浜烘暟">
                         </el-table-column>
+                      <el-table-column prop="guaranteeNum"  align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
                         <el-table-column
                             prop="serviceDays"
                             align="center"
@@ -460,7 +461,7 @@
         <!--    浼佷笟鐢宠閫�鍥�    -->
         <applyReturn ref="applyReturn" @success="successEvent" />
         <!--    鏂板鎶曚繚    -->
-        <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="successEvent" />
+        <OperaInsuranceApplyAddWindowNew ref="OperaInsuranceApplyAddWindow" @success="successEvent" />
         <!--    鍔犲噺淇濈敵璇�    -->
         <additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
         <!--    鏇存崲娲鹃仯鍗曚綅鐢宠    -->
@@ -470,6 +471,7 @@
         <!-- 鏇存崲娲鹃仯鍗曚綅璇︽儏 -->
         <OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/>
         <!--    楠岃瘉鎵嬫満鍙�    -->
+        <OperaPdfViewerWindow ref="OperaPdfViewerWindow"  />
         <operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
         <template v-slot:footer>
             <el-button @click="visible=false">杩斿洖</el-button>
@@ -506,10 +508,11 @@
 
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
-import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
+import OperaInsuranceApplyAddWindowNew from '@/components/enterprise/OperaInsuranceApplyAddWindowNew'
 import GlobalWindow from '@/components/common/GlobalWindow'
 import InsuranceDetails from '@/components/business/InsuranceDetails'
 import OperaWtbApplyCheckWindow from '@/components/business/OperaWtbApplyCheckWindow'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
 import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
 import factoryChange from '@/components/enterprise/factoryChange'
 import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
@@ -537,9 +540,10 @@
   components: {
     GlobalWindow,
     InsuranceDetails,
+    OperaPdfViewerWindow,
     OperaWtbApplyCheckWindow,
     applyReturn,
-    OperaInsuranceApplyAddWindow,
+    OperaInsuranceApplyAddWindowNew,
     additionSubtractionApplication,
     factoryChange,
     OperaApplyChangeDetailWindow,
@@ -793,7 +797,7 @@
     exportExcel () {
       if (this.activeName === '0') {
         exportExcel({
-          capacity: 10,
+          capacity: 60000,
           page: this.currentPage,
           model: {
             solutionName: this.tableData[0].solutionsName,
@@ -812,7 +816,7 @@
         })
       } else {
         applyChagneDetailExcel({
-          capacity: 10,
+          capacity: 60000,
           page: this.currentPage,
           model: {
             applyId: this.dataId,
@@ -905,27 +909,34 @@
     viewToubaodan () {
       if (this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull) {
         setTimeout(() => {
-          window.open(this.model.toubaodanSignedFile.fileurlFull)
+          this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanSignedFile.fileurlFull)
+          // window.open(this.model.toubaodanSignedFile.fileurlFull)
         }, 500)
       } else if (this.model.toubaodanFile && this.model.toubaodanFile.fileurlFull) {
         setTimeout(() => {
-          window.open(this.model.toubaodanFile.fileurlFull)
+          this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanFile.fileurlFull)
+          // window.open(this.model.toubaodanFile.fileurlFull)
         }, 500)
       }
     },
     viewBaoxiandan () {
       if (this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull) {
-        window.open(this.model.baoxiandanFile.fileurlFull)
+
+        this.$refs.OperaPdfViewerWindow.open('鏌ョ湅淇濋櫓鍗�',this.model.baoxiandanFile.fileurlFull)
+        // window.open(this.model.baoxiandanFile.fileurlFull)
       }
     },
     viewFanganshu () {
       if (this.model.fanganFile && this.model.fanganFile.fileurlFull) {
-        window.open(this.model.fanganFile.fileurlFull)
+        this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鏂规纭涔�',this.model.fanganFile.fileurlFull)
+
+        // window.open(this.model.fanganFile.fileurlFull)
       }
     },
     viewShenqingdan () {
-      if (this.model.shenqingdanFile && this.model.shenqingdanFile.fileurlFull) {
-        window.open(this.model.shenqingdanFile.fileurlFull)
+      if (this.model.shenqingdanFile && this.model.shenqingdanFile.fileurlFull){
+        this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鐢宠鍗�',this.model.shenqingdanFile.fileurlFull)
+        // window.open(this.model.shenqingdanFile.fileurlFull)
       }
     },
     handleSizeChange (val) {

--
Gitblit v1.9.3