From 366207f8976bbbe431a2dc05a6920f5180795e78 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 6 Sep 2023 13:04:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C-?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BD=91=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js   | 17 +++++++++++++++-
 src/api/sunVillage_info/sysCbf.js        |  9 +++++++++
 src/views/sunVillage_info/list_cbf.vue   | 11 ++++++++++-
 src/views/sunVillage_info/list_cbfsq.vue | 25 ++++++++++++++++++++----
 src/views/sunVillage_info/list_cbht.vue  | 11 ++++++++++-
 5 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index d9f6920b..7a2a5732 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -911,7 +911,22 @@ export function getMessage(id) {
     method: 'get',
   })
 }
-
+//e签宝-发包方合同网签
+export function eqbFbfhtwq(data){
+  return request({
+    url: '/open/villageAffairs/public/eqbFbfhtwq',
+    method: 'post',
+    data: data
+  })
+}
+//e签宝-合同网签
+export function eqbCbfhtwq(data){
+  return request({
+    url: '/open/villageAffairs/public/eqbCbfhtwq',
+    method: 'post',
+    data: data
+  })
+}
 // 资源公开
 export function orcodeList(query) {
   return request({
diff --git a/src/api/sunVillage_info/sysCbf.js b/src/api/sunVillage_info/sysCbf.js
index 70dfc3aa..e6e975c8 100644
--- a/src/api/sunVillage_info/sysCbf.js
+++ b/src/api/sunVillage_info/sysCbf.js
@@ -74,4 +74,13 @@ export function examineSign(data){
     data: data
   })
 }
+//承包方e签宝授权
+export function eqbEmpower(data){
+  return request({
+    url:'/open/villageAffairs/public/eqbEmpower',
+    method: 'post',
+    data: data
+  })
+}
+
 
diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue
index 7051547e..9d7df834 100644
--- a/src/views/sunVillage_info/list_cbf.vue
+++ b/src/views/sunVillage_info/list_cbf.vue
@@ -44,6 +44,10 @@
                 <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)">
+                <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
+                <p>合同网签</p>
+              </div>
               <div class="opera_btn" @click="openPopupGsjg(item.cbfbm)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="30">
                 <p>公示结果签名</p>
@@ -95,7 +99,7 @@
 </template>
 
 <script>
-  import { getCbf, getCbhtList, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
+  import { getCbf, eqbCbfhtwq,getCbhtList, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
   import Cookies from "js-cookie";
@@ -191,6 +195,11 @@
           this.handleReset();
         });
       },
+      contractSign(val){
+        eqbCbfhtwq(val).then(response => {
+          window.location.href = response.data;
+        });
+      },
       openPopupFile(id){
         this.fileList = [];
         this.signaId = id;
diff --git a/src/views/sunVillage_info/list_cbfsq.vue b/src/views/sunVillage_info/list_cbfsq.vue
index e17ab379..2a6c71af 100644
--- a/src/views/sunVillage_info/list_cbfsq.vue
+++ b/src/views/sunVillage_info/list_cbfsq.vue
@@ -83,16 +83,19 @@
       <van-field readonly v-model="isDepositName" label="是否纳入托管" placeholder="是否纳入托管" input-align="right" :border="false" />
       <van-field readonly v-model="form.tgmj" label="托管面积(亩)" placeholder="托管面积(亩)" input-align="right" :border="false" />
       <div style="margin: 30px auto 0;width: 50%;">
-        <van-button round block type="primary" native-type="submit" >
+        <van-button round block type="primary" v-if="sqbutShow"  @click="cbfsq">
           授权
         </van-button>
+        <van-button round block type="primary" v-if="!sqbutShow"  >
+          授权完成
+        </van-button>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import { getCbfList} from "@/api/sunVillage_info/sysCbf";
+  import { getCbfList,eqbEmpower} from "@/api/sunVillage_info/sysCbf";
   import FieldSelect from "@/components/form/FieldSelect";
   import Cookies from "js-cookie";
   import $ from "jquery";
@@ -104,6 +107,7 @@
         form:{},
         showForm2:false,
         showesign:false,
+        sqbutShow:false,
         sysFarmer:JSON.parse(Cookies.get('user')),
         zjlxName:"",
         cbfTypeName:"",
@@ -124,7 +128,7 @@
       };
     },
     created() {
-      this.getSysFfb();
+      this.getSysCfb();
     },
     methods: {
       InitOptions() {
@@ -133,11 +137,24 @@
           this.getDicts(k).then((resp) => this.options[k] = resp.data);
         }
       },
-      getSysFfb(){
+      /*承包方授权*/
+      cbfsq(){
+        console.info(3333333333);
+        eqbEmpower(this.form).then(response => {
+          if(response.code === 200 ){
+            this.sqbutShow = false;
+          }
+        });
+      },
+      getSysCfb(){
         getCbfList({deptId:this.sysFarmer.deptId,cbfzjhm:this.sysFarmer.idcard}).then(response => {
+          this.sqbutShow = true;
           let _this = this;
           if(response.rows.length > 0){
             this.form = response.rows[0];
+            if(this.form.accountId != null && this.form.accountId !== ""){
+              this.sqbutShow = false;
+            }
             this.getDicts("zjlx").then(response => {
               response.data.forEach(function (item) {
                 if (item.dictValue ===  _this.form.cbfzjlx) {
diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index 47d31db0..cfe2714a 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -46,6 +46,10 @@
                 <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)">
+                <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
+                <p>合同网签</p>
+              </div>
               <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
@@ -95,7 +99,7 @@
 </template>
 
 <script>
-  import { listCbht, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
+  import { listCbht,eqbFbfhtwq, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
 
@@ -215,6 +219,11 @@
         this.$refs.esign.reset();
         $('#canvasTT').css('display', 'block')
       },
+      contractSign(val){
+        eqbFbfhtwq(val).then(response => {
+          window.location.href = response.data;
+        });
+      },
       // 生成签字图
       handleGenerate() {
         this.$refs.esign

From 6cc00b99051adbf0bda97c528c9288a40f870fae Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 7 Sep 2023 08:50:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |  16 ++++
 src/assets/images/sunVillage_info/archive.png | Bin 0 -> 1726 bytes
 .../images/sunVillage_info/download.png       | Bin 0 -> 1746 bytes
 src/views/sunVillage_info/list_cbht.vue       |  70 +++++++++++++++++-
 src/views/sunVillage_info/list_fbfsq.vue      |   1 -
 5 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/archive.png
 create mode 100644 src/assets/images/sunVillage_info/download.png

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 7a2a5732..d0e74cbe 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -780,6 +780,22 @@ export function cbhtFirstSign(data,id) {
   })
 }
 
+// 签字流程归档
+export function signProcessArchive(id) {
+  return request({
+    url: '/service/cbht/sign/archive/' + id,
+    method: 'get'
+  });
+}
+
+// 签署合同下载
+export function signedContractDownload(id) {
+  return request({
+    url: '/service/cbht/sign/download/' + id,
+    method: 'get'
+  });
+}
+
 // 查询承包合同详细
 export function getCbht(query, id) {
   return request({
diff --git a/src/assets/images/sunVillage_info/archive.png b/src/assets/images/sunVillage_info/archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..54826d4aa0a9dd670b9361d8c27ee3db81ef4c88
GIT binary patch
literal 1726
zcmcIlYfuwc6pkQPY*EloEm+z$h{G${Y)A;nkTRHrn$ciPQU%*uLbAY$$%f6+#8?@0
zV0^Sw$5uLa1Z!~$%BvEE(ZQkviij3bR0={nQ>Y5o0x_Fc^XLWv`=j(<@66tN&z<l4
z&N=s-xqDEW@m|Q1h$R#XB}BYlC?i)k`LPxUl5?cG<T1H~<DyJlj^^S9B?eQ{)MyS2
zh&9SQSOzQAy9#f>DHKZJYDAHVXG%8mRH%lo^ke8ojgDkfC@HB%ol;c*<3J9ahiLiK
ziPp<h08#U)TiFtZL??jrk@Y4FmYXsZDpP@qtEQ&D3#1r%q<{v-m4H#RQ>*70`P6A$
z9=Z1)gH&J|f*0_qFM`UHNC5$g!2p|{L{mX5Ccxp+p(F;E$w~m242T0VI3ScrV?aDc
z5-*Vp%nT~&4O8dxWWw|rU!=vS=Hs}I2Z9EJfo@2oqgWmYak*TO!33F18i}CkcWH5@
zk*3v0%_<0Cy$VBgID%>czoIe+EyDR!GSU|*XmoS3TK&v5krxIUl{yfjGyEyd0wt3F
zhH5l(Xgw~2U&i~d!g|Fn9Sq7~Jz9jR$in4D`CaLF0t{B-D5gNsowK(n%|~%mpO5MQ
zfdGivifGlSK_5E}mq>VGtsYluRj^pdr;-A61X1%i95yp4jm=>R*hvs15+$>Q$pR)T
zUBDGEnIZ_9<qA<%kp|Y{vt0E{Zt}cbe<x^kq-P<FA)mnNbPUx1(;4%S`D0<vt2e_{
z&mT+Dyj+kB2K3kUA9bERBAds*o$FfCnCp93OEx=3cJ;R`{do#yL4<UpLPXR@dR<fQ
zu?~CtHs?=9qAA`p`GBa4AR4G%`?$Srlh^jx>v(3rBzBKqv$th<Ci{I}x5qO4*U(98
zO_=rc3a@k0HE@h*jJCCKt!LhFkG9w@u5)y22{YYVz0BEL;u@^*I-Yu_2JLN9dwUkq
z80GBw)cgEb&qSZ&nu=&#<FO1mI&(diheX3_YfY%5<3r+X98nwY`SY%$<0IF-&z(KH
zZD!DMJ<nRR+|j9a-TTaWXRntSC7Kf4PuhKM8)2q-9e=pTJ8jJzqHdM@QLFXz>z-#l
z&K{FzYQWL0bM=4enflp&d9&>t({>JWKkf2)Jw*N6uEFC(1K=LJ>bzO#>@9Y5AwHka
zTD_E<gD3kM$aiBqF3XUU=KnV+O<nZ0WIaxag=q@o;Q0srSUV#$NE)_JGI7niJz(|G
z-VLUSADi4hv~<nFo941I=0()zxRsxP815)4v+<#&D;F_hN*|8oOGjQ6ww*1_DZVmt
zxGaI!J-n=hx3_KgL37B{la;RCbU70CWFVs;t~KoI>-k&j?nXZOy-ipf5^R+tvE}`*
zB|y6i%Ljs5jxo)a(GvES+v|!-_>~_whi9dUS{}u{Qg_vLs={*o@P>|*{r%zyeQ|vM
zZx@}(N1mt48^P%8yhVZ)g0jxiZ{lS4M%{b%9H|SaK9mSo#frX|Y&cPsz=#cO6LKtt
zG4CAGpH9X?#{<sf6h|Koj9y%BlEsegl?JcD>L(X2*dIVI>TGUbiC_6{d2Q<Ls<$dy
zZyBnz7c#&R2^51a@obU3Zx9Eaj8DtbSn%deidFUI$iDkavj)z_4Gw?M*E2@T5^>{g
z`1ySiH!8cj`wmuzuZY^Q%{!#b8@|+8vV(?UT{e6(SO<MSS|t6Y2MXiMYkpuhq^-T#
z68+T)>HP|8ZF}m*^5?-x_ZM%V9*|u)a<?KoHRw%B;EuBDP{5?{|53!E3}NHC?0tU&
DZgCcS

literal 0
HcmV?d00001

diff --git a/src/assets/images/sunVillage_info/download.png b/src/assets/images/sunVillage_info/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..80fbe3185384f52932298e19170c6be024ae34c8
GIT binary patch
literal 1746
zcmeAS@N?(olHy`uVBq!ia0vp^ra)}M!3-p2QyQKFDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49tp|ArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XQrEMXkw&bZmDNz
zW?*S#qN8ABU}&yyV6JaytZQIsWngAyY^eYRN<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo
z<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mX=fTvCgZi!uvJGV}8kKqe+8
z<(HP&Dgj*z@j`9^+}ONgXfOc-Our(rK;KZ$0OTc@LSJ9}N^^7Js*6j4QW5UOYH)E#
zWkITbP-=00X;CsT;?k5sRuxz|7o{ea<QIkH=jXseF(4zqB)>Q#zd*s+SwSN_GcP5-
zyjT;g+}GF2Gq1QLF)umQ)5TT^Xn<a3W{Q=$fsu)miMfG^v#FV(p{uK<tE-u%i=mN;
zk&Ba&o1r62uS<S%X>Mv>2~2MaLa!lCy`YqkTL84#CABECEH%ZgC_h&L>|?7;oNh65
z#c3W?ZwgMgn7QH9s}FRHJ}6$1;u$6cOgtbaJk<g@@N}P=2Tbfmz*K!hny;IIfl)lb
zC&aa4=f`O$zwkFdi(2)r{ov>Rqo3!V`6|`<T(ISt_N15BUj6o8`c}C0*{d&qo#wqh
z`tYac!Z+QAKi_@(`}*tO+irc&+xkJQ{rTH(e?NTx>$l|X^Ur^0oci+T-+!gv7YojP
z4OseCZ_3NYeV<hOU%dYMcg~rwHM>9Fdh`4KyFWcgK3{tA%W~#x$<F67tKX$>e6QI1
zLVwE3*fsBLXTMHa|2}#B`?L-3@4Wrpu<w)Q%vS;}&y@RK+<yD}@{3<Wt<NG?zI*!d
z&(xD&R$l&g<MnU*Ij?7*{%Sb&l}Ow3DJQ-JE_=K6=68!3uZ*U?(w+QLq34B4-wW6I
zZ?@n1A>H*ndeu9f$uFySe~e%I&UeXMtw}HI_Iz4<^;__=xBvhD=WBijB#q>cya5&(
zu_Zx%!9Xs}0K>!eb0+}fVz;M@V@SoVE!UoxH8}{dJ_vOdxpJerbMMi08&ziAtJd#(
z|6k^ySZeu%Nt1v3KYUz}u+uu_jM@v|Yu<kud44Uex+Lv#PT`CEw-eJ?!;)`y-4LC!
zJc-$CTUUB7mw9!=^6NaOSN2Fg**w`X^Z?82WUdWb^~_$Dr!QyOv!2?i?={t$Ela3)
z{i-kAE4b&!t$Ja$qSy4-YOV!#t*y7dW(WM+yVL32`ofGE&mPU%dwgb*LbyrKvzrP1
zmdmu31h%SqG4yh=1g4s<UbCX&Y?u6GnT)UpiiNUTel=E8`YlQ|)IDDWa5|N@zP+vT
ztZ?Bzwf%ZaW7+*%_MQ99agwuCXmQVMokuH*&&{-Uk?4KUcc)3{@r31#HkF!>H>mgT
zeHwafVZLN+p!czd+OH(88H#kS7XKggjK_V?op8%!i>C0MY%>hPgPwI9*w*{B*PznO
zDA(C^Hg|OU{G836(O<ZN-E+FVq<=qbaQ(@4=|=MOwt3~c<w~pP&CQteEOZh7@A>5s
zh34y5Ib2n;wS1D*wPKp{vMCFhq}WP)T$XRT9DZ73`;_R1rjzGga8uvA?E`=C)0(EY
nQ+8__&j`L-#6CBno<)M8vaZXt{d;^msFv|`^>bP0l+XkK+o2KF

literal 0
HcmV?d00001

diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index cfe2714a..9d7a3fb2 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -10,6 +10,15 @@
     </div>
 
     <div class="list_main">
+      <van-search
+        v-model="searchKeyword"
+        shape="round"
+        background="transparent"
+        placeholder="请输入承包方姓名搜索"
+        @search="onSearch"
+        @clear="onSearch"
+      ></van-search>
+
       <van-list
         v-model="loading"
         :finished="finished"
@@ -50,6 +59,16 @@
                 <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="handleArchive(item.id)">
+                <img src="../../assets/images/sunVillage_info/archive.png" alt="" width="35">
+                <p>归档</p>
+              </div>
+              <div class="opera_btn" v-if="item.signingMode === '线上' && item.signingStatus === '合同归档'"
+                   @click="handleDownload(item.id)">
+                <img src="../../assets/images/sunVillage_info/download.png" alt="" width="35">
+                <p>下载合同</p>
+              </div>
               <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
@@ -99,7 +118,7 @@
 </template>
 
 <script>
-  import { listCbht,eqbFbfhtwq, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
+  import { listCbht,eqbFbfhtwq, signProcessArchive, signedContractDownload, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
 
@@ -117,7 +136,8 @@
         listLength: '0',
         queryParams: {
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 15,
+          cbfmc: null,
           translate_dict: 1,
           // 查询排序
           orderByColumn: "id",
@@ -135,7 +155,9 @@
           isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         },
         signaId: '',
-        height: null
+        height: null,
+        // 查询关键字
+        searchKeyword: null,
       };
     },
     created() {
@@ -149,6 +171,7 @@
         $('#canvasTT').css('display', 'none');
       },
       getList() {
+        this.loading = true;
         listCbht(this.queryParams).then(response => {
           response.rows.forEach(item => {
             this.applicationList.push(item);
@@ -261,6 +284,47 @@
           type: mime
         })
       },
+      // 签字流程归档
+      handleArchive(id) {
+        this.$dialog.confirm({
+          message: '是否确认归档？',
+        }).then(() => {
+          // on confirm
+          signProcessArchive(id).then(res => {
+            if (res.code === 200) {
+              this.$toast({
+                icon: 'success',
+                message: '归档完成',
+                duration: "1000"
+              });
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
+      // 签署合同下载
+      handleDownload(id) {
+        this.$dialog.confirm({
+          message: '是否确认下载签署合同？',
+        }).then(() => {
+          // on confirm
+          signedContractDownload(id).then(res => {
+            if (res.code === 200) {
+              window.location.href = res.data;
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
+      onSearch(){
+        this.queryParams.cbfmc = this.searchKeyword;
+        this.queryParams.pageNum = 1;
+        this.finished = false;
+        this.applicationList = [];
+        this.getList();
+      }
     },
   }
 </script>
diff --git a/src/views/sunVillage_info/list_fbfsq.vue b/src/views/sunVillage_info/list_fbfsq.vue
index 23027a85..dc3bbba2 100644
--- a/src/views/sunVillage_info/list_fbfsq.vue
+++ b/src/views/sunVillage_info/list_fbfsq.vue
@@ -57,7 +57,6 @@
         listFbf({deptId: this.$store.state.user.loginDeptId, translate_dict: 1}).then(response => {
           if (response.rows.length > 0) {
             this.form = response.rows[0];
-            console.log(this.form);
           }
         });
       },

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 3/4] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E7=BD=91=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() {

From 304640eda6bfadd32c57cf6f354c138949db4447 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Fri, 8 Sep 2023 14:32:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_cbht.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index ddcf628b..e1db8bd8 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -305,7 +305,13 @@
               this.$toast({
                 icon: 'success',
                 message: '归档完成',
-                duration: "1000"
+                duration: "1000",
+                onClose: () => {
+                  this.queryParams.pageNum = 1;
+                  this.finished = false;
+                  this.applicationList = [];
+                  this.getList();
+                }
               });
             }
           });