From 6b8461c2048c3a9bd1e7caae77d567bd044cd992 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Fri, 8 Sep 2023 14:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C=E7=BD=91?=
 =?UTF-8?q?=E7=AD=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_cbf.vue  | 15 +++++++++++++--
 src/views/sunVillage_info/list_cbht.vue | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue
index 9d7df834..07e6459d 100644
--- a/src/views/sunVillage_info/list_cbf.vue
+++ b/src/views/sunVillage_info/list_cbf.vue
@@ -44,7 +44,7 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div> -->
-              <div class="opera_btn" v-if="item.signingMode == '线上' && item.signingStatus !='签字完成'"  @click="contractSign(item)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.cbfqszt !='2'"  @click="contractSign(item)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>合同网签</p>
               </div>
@@ -65,6 +65,9 @@
         </van-swipe-cell>
       </van-list>
     </div>
+    <van-dialog v-model="htqsShow" title="合同签署" confirmButtonText="关闭" @confirm="confirmn">
+      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>
+    </van-dialog>
     <van-popup v-model="show" closeable position="right" :style="{ height: '100%' }" >
       <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
         <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
@@ -114,6 +117,8 @@
         finished: false,
         show: false,
         showFile: false,
+        htqsShow:false,
+        noticeUrl:false,
         fileList: [],
         listLength: '0',
         cbfbm:"",
@@ -197,8 +202,14 @@
       },
       contractSign(val){
         eqbCbfhtwq(val).then(response => {
-          window.location.href = response.data;
+          this.noticeUrl =  response.data;
+          this.htqsShow = true;
         });
+
+      },
+      confirmn(){
+        this.applicationList = [];
+        this.getList();
       },
       openPopupFile(id){
         this.fileList = [];
diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index 9d7a3fb2..ddcf628b 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -55,7 +55,7 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div> -->
-              <div class="opera_btn" v-if="item.signingMode == '线上' && item.signingStatus !='签字完成'"  @click="contractSign(item)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.fbfqszt !='2'"  @click="contractSign(item)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>合同网签</p>
               </div>
@@ -82,7 +82,9 @@
         </van-swipe-cell>
       </van-list>
     </div>
-
+    <van-dialog v-model="htqsShow" title="合同签署" confirmButtonText="关闭" @confirm="confirmn">
+      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>
+    </van-dialog>
     <!-- 签字弹出层 -->
     <van-popup v-model="show" closeable position="right" :style="{ height: '100%' }">
       <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
@@ -132,6 +134,8 @@
         finished: false,
         show: false,
         showFile: false,
+        htqsShow:false,
+        noticeUrl:"",
         fileList: [],
         listLength: '0',
         queryParams: {
@@ -237,6 +241,10 @@
       signaImgFun(url) {
         this.signatureImg = url;
       },
+      confirmn(){
+        this.applicationList = [];
+        this.getList();
+      },
       // 清空画板
       handleReset() {
         this.$refs.esign.reset();
@@ -244,8 +252,10 @@
       },
       contractSign(val){
         eqbFbfhtwq(val).then(response => {
-          window.location.href = response.data;
+          this.noticeUrl =  response.data;
+          this.htqsShow = true;
         });
+
       },
       // 生成签字图
       handleGenerate() {