From 9cc3cc17b29a1840504d10a1215216da89aafd1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 27 Mar 2023 13:25:28 +0800
Subject: [PATCH] =?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/views/project/projectDetail.vue          |  3 ++
 src/views/sunVillage_info/list_signature.vue | 43 +++++++++++++++++---
 src/views/user/signature/signatureList.vue   | 21 +++++++---
 3 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 45d4a162..e961ab43 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -383,6 +383,7 @@ export default {
               let data= {
                 projectId:this.id,
                 memberId:res.data.id,
+                depositStatus:'1'
               };
               getSignup(data).then(r =>{
                 if(r.data=="1"){
@@ -405,6 +406,7 @@ export default {
               let data= {
                 projectId:this.id,
                 memberId:res.data.id,
+                depositStatus:'1'
               };
               getSignup(data).then(r =>{
                 if(r.data=="1"){
@@ -434,6 +436,7 @@ export default {
               let data= {
                 projectId:this.id,
                 memberId:res.data.id,
+                depositStatus:'1'
               };
               getSignup(data).then(r =>{
                 if(r.data=="1"){
diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue
index 4430fa36..4fb3bd00 100644
--- a/src/views/sunVillage_info/list_signature.vue
+++ b/src/views/sunVillage_info/list_signature.vue
@@ -46,10 +46,12 @@
                 <p>预览</p>
               </div>
               <div class="opera_btn" v-if="item.signingMode == '线上' && item.isArchive == '是' ">
+                <a :href="'/api'+item.contractPdf" style="color: #333333">
                 <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
                 <p>电子合同</p>
+                </a>
               </div>
-              <div class="opera_btn" v-if="item.signingMode == '线下' ">
+              <div class="opera_btn" v-if="item.signingMode == '线下' " @click="openPopupFile(item.attachement)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
                 <p>线下合同</p>
               </div>
@@ -58,14 +60,16 @@
         </van-swipe-cell>
       </van-list>
     </div>
-    <van-popup v-model="show" closeable round position="bottom" >
-      <van-cell-group style="width: 100%;overflow: hidden;padding-top: 10px;padding-bottom: 5%;">
+
+    <!-- 签字弹出层 -->
+    <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">
           <vue-esign
             ref="esign"
             class="mySign"
             :width="500"
-            :height="225"
+            :height="height"
             :isCrop="signature.isCrop"
             :lineWidth="signature.lineWidth"
             :lineColor="signature.lineColor"
@@ -78,6 +82,11 @@
         </div>
       </van-cell-group>
     </van-popup>
+
+    <!-- 附件弹出层 -->
+    <van-popup v-model="showFile" round closeable position="bottom" :style="{ height: '30%' }" >
+      <van-uploader v-model="fileList" multiple disabled :deletable="false" :show-upload="false" />
+    </van-popup>
   </div>
 </template>
 
@@ -94,6 +103,7 @@
         loading: false,
         finished: false,
         show: false,
+        showFile: false,
         fileList:[],
         listLength:'0',
         queryParams:{
@@ -113,12 +123,14 @@
           isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         },
         signaId:'',
+        height:null
       };
     },
     created() {
       if (this.$route.query.type == 'code'){
         this.showBtn = false;
       }
+      this.height = window.screen.height*1.28-20;
     },
     methods: {
       getList(){
@@ -142,6 +154,18 @@
         this.show = true;
         this.signaId = id;
       },
+      openPopupFile(file){
+        this.showFile = true;
+        console.log(file)
+        if (!file) return;
+        let fileArray = file.split(',');
+        fileArray.map(res=>{
+          this.fileList.push({
+            url: '/api'+res,
+            isImage: true
+          })
+        })
+      },
       signaImgFun(url){
         this.signatureImg = url;
         // console.log(url)
@@ -440,10 +464,17 @@
     .signature-box{
       border:1px dashed #666;
       margin:2px 20px;
+      height: 100%;
+      /*canvas{*/
+      /*  height: 100%!important;*/
+      /*}*/
     }
     .signature-footer{
-      margin:15px 20px 0;
-      display: flex;
+      transform: rotate(90deg);
+      width: auto;
+      position: absolute;
+      top: 50%;
+      left: 0PX;
       .clearBtn{
         margin-left: 15px;
       }
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index c9a6719e..6d54b821 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -35,7 +35,7 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" v-if="item.signingMode == '线上' && item.secondIsSign =='否' " @click="openPopup(item.id)">
+              <div class="opera_btn" @click="openPopup(item.id)" v-if="item.signingMode == '线上' && item.secondIsSign =='否' ">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>
@@ -56,14 +56,14 @@
         </van-swipe-cell>
       </van-list>
     </div>
-    <van-popup v-model="show" closeable round position="bottom" >
-      <van-cell-group style="width: 100%;overflow: hidden;padding-top: 10px;padding-bottom: 5%;">
+    <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">
           <vue-esign
             ref="esign"
             class="mySign"
             :width="500"
-            :height="225"
+            :height="height"
             :isCrop="signature.isCrop"
             :lineWidth="signature.lineWidth"
             :lineColor="signature.lineColor"
@@ -111,12 +111,14 @@
           isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         },
         signaId:'',
+        height:null
       };
     },
     created() {
       if (this.$route.query.type == 'code'){
         this.showBtn = false;
       }
+      this.height = window.screen.height*1.28-20;
     },
     methods: {
       getList(){
@@ -438,10 +440,17 @@
     .signature-box{
       border:1px dashed #666;
       margin:2px 20px;
+      height: 100%;
+      /*canvas{*/
+      /*  height: 100%!important;*/
+      /*}*/
     }
     .signature-footer{
-      margin:15px 20px 0;
-      display: flex;
+      transform: rotate(90deg);
+      width: auto;
+      position: absolute;
+      top: 50%;
+      left: 0PX;
       .clearBtn{
         margin-left: 15px;
       }