From dc49c0bb65f2c7792d79828c2b1f8fb3e76b435b Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 30 Mar 2023 14:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=90=88=E5=90=8C=E5=92=8C?=
 =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=86=9C=E6=88=B7=E7=9A=84=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sunVillage_info/list_multipleLots.vue     | 64 ++++++++++++-----
 .../sunVillage_info/list_multipleLotsNh.vue   | 72 +++++++++++++------
 .../list_multipleLotsNh_detail.vue            |  1 +
 src/views/sunVillage_info/list_signature.vue  |  2 +-
 4 files changed, 98 insertions(+), 41 deletions(-)

diff --git a/src/views/sunVillage_info/list_multipleLots.vue b/src/views/sunVillage_info/list_multipleLots.vue
index 7e864d36..d82309bb 100644
--- a/src/views/sunVillage_info/list_multipleLots.vue
+++ b/src/views/sunVillage_info/list_multipleLots.vue
@@ -4,7 +4,7 @@
       class="header_main"
       :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
     >
-      标段合同网签
+      标段合同
       <div class="return_btn" @click="onClickLeft"></div>
       <!--      <div class="add_btn" @click="goAdd" v-show="showBtn"></div>-->
     </div>
@@ -16,7 +16,7 @@
         finished-text="没有更多了"
         @load="getList"
       >
-        <van-swipe-cell v-for="item in applicationList" :key="item.id" :disabled="item.firstIsSign === '是'">
+        <van-swipe-cell v-for="item in applicationList" :key="item.id">
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
@@ -26,7 +26,7 @@
                 <p class="tips_mark"
                    :style="{'color': item.firstSigning != null ? '#79bc29' : '#f8a83d','background': item.firstSigning != null ? '#e8ffcd' : '#ffedcd'}">
                   {{item.signingMode}}</p>
-                <p class="tips_mark2" :style="{'background': item.firstSigning != null ? '#2bc30c' : '#eb1616'}">{{item.signingStatus}}</p>
+                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': item.firstSigning != null ? '#2bc30c' : '#eb1616'}">{{item.signingStatus}}</p>
               </div>
               <div class="time">
                 <p>{{item.contractName}}</p>
@@ -41,10 +41,10 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>
-              <!-- <div class="opera_btn" v-if="item.signingMode == '线下' " @click="openPopupFile(item.attachement)">
+              <div class="opera_btn" @click="openPopupFile(item.id)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
-                <p>线下合同</p>
-              </div> -->
+                <p>附件</p>
+              </div>
             </div>
           </template>
         </van-swipe-cell>
@@ -76,14 +76,19 @@
     </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 v-model="showFile" round closeable position="bottom" :style="{ height: '30%' }" >
+      <div style="padding: 0 3%;">
+        <van-divider>附件</van-divider>
+        <van-uploader v-model="fileList" accept="" :after-read="afterRead" @delete="deleteFile" />  <!-- accept=".jpg, .gif, .png, .jpeg, .txt, .pdf, .doc, .docx, .xls, .xlsx" -->
+      </div>
     </van-popup>
   </div>
 </template>
 
 <script>
   import { listMultiplelots, multipleLotsFirstSign } from "@/api/sunVillage_info/fixedAssets";
+  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
+  import request from "@/utils/request";
   import vueEsign from "vue-esign";
   import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
@@ -155,16 +160,41 @@
         this.show = true;
         this.signaId = id;
       },
-      openPopupFile(file) {
+      openPopupFile(id){
+        this.fileList = [];
+        this.signaId = id;
         this.showFile = true;
-        if (!file) return;
-        let fileArray = file.split(',');
-        fileArray.map(res => {
-          this.fileList.push({
-            url: '/api' + res,
-            isImage: true
+        let queryParams = {
+          tableId: id,
+          tableName: 't_transaction_multiplelots',
+        };
+        attachmentList(queryParams).then(response => {
+          response.rows.map(res => {
+            // let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({
+              url: '/api'+res.fileUrl,
+              file: new File([], res.fileName,{}),
+              id: res.id
+            });
           })
-        })
+        });
+      },
+      afterRead(file) {
+        // 此时可以自行将文件上传至服务器
+        let params = new FormData();
+        params.append("tableId", this.signaId);
+        params.append("tableName", "t_transaction_multiplelots");
+        params.append("bizPath", "transaction");
+        params.append("fileType", '0');
+        params.append("file", file.file);
+        commonAttach(params).then(response => {
+          this.$notify({ type: 'success', message: '上传成功' });
+        });
+      },
+      deleteFile(file){
+        systemAttachment(file.id).then(res => {
+          this.$notify({ type: 'success', message: '删除成功' });
+        });
       },
       signaImgFun(url) {
         this.signatureImg = url;
@@ -423,7 +453,7 @@
 
         .opera_btn {
           border-radius: 50%;
-
+          padding: 0 10px;
           &.delete {
             background: #df0707;
             margin-left: 10PX;
diff --git a/src/views/sunVillage_info/list_multipleLotsNh.vue b/src/views/sunVillage_info/list_multipleLotsNh.vue
index c8091773..07726871 100644
--- a/src/views/sunVillage_info/list_multipleLotsNh.vue
+++ b/src/views/sunVillage_info/list_multipleLotsNh.vue
@@ -17,7 +17,7 @@
         @load="getList"
       >
         <!----1-->
-        <van-swipe-cell v-for="(item,index) in applicationList" :key="index" :disabled="item.secondIsSign === '是'" >
+        <van-swipe-cell v-for="item in applicationList" :key="item.id" >
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
@@ -25,7 +25,7 @@
                 <i class="icon_box1" v-if="item.secondSigning!=null"></i>
                 <p class="news_title" :style="{'color': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.contractCode}}</p>
                 <p class="tips_mark" :style="{'color': item.secondSigning!=null?'#79bc29':'#f8a83d','background': item.secondSigning!=null?'#e8ffcd':'#ffedcd'}">{{item.signingMode}}</p>
-                <p class="tips_mark2" :style="{'background': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.signingStatus}}</p>
+                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.secondIsSign === '是' ? '已签名' : '未签名'}}</p>
               </div>
               <div class="time">
                 <p>{{item.contractName}}</p>
@@ -35,23 +35,14 @@
           </div>
           <template #right>
             <div class="operation">
-              <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" @click="openPopup(item.id)" v-if="item.secondIsSign === '否' ">
+              <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>
-              <!-- <div class="opera_btn" style="margin: 0 10px;" v-if="item.signingMode == '线上' && item.attachement !=  null ">
-                <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.isArchive == '是' ">
+              <div class="opera_btn" @click="openPopupFile(item.id)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
-                <p>电子合同</p>
+                <p>附件</p>
               </div>
-              <div class="opera_btn" v-if="item.signingMode == '线下' ">
-                <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
-                <p>线下合同</p>
-              </div> -->
             </div>
           </template>
         </van-swipe-cell>
@@ -78,11 +69,21 @@
         </div>
       </van-cell-group>
     </van-popup>
+
+    <!-- 附件弹出层 -->
+    <van-popup v-model="showFile" round closeable position="bottom" :style="{ height: '30%' }" >
+      <div style="padding: 0 3%;">
+        <van-divider>附件</van-divider>
+        <van-uploader v-model="fileList" accept="" :after-read="afterRead" @delete="deleteFile" />  <!-- accept=".jpg, .gif, .png, .jpeg, .txt, .pdf, .doc, .docx, .xls, .xlsx" -->
+      </div>
+    </van-popup>
   </div>
 </template>
 
 <script>
   import { listMultipleLotsNh, multipleLotsSecondSign } from "@/api/sunVillage_info/fixedAssets";
+  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
+  import request from "@/utils/request";
   import vueEsign from "vue-esign";
   import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
@@ -153,16 +154,41 @@
         this.show = true;
         this.signaId = id;
       },
-      openPopupFile(file) {
+      openPopupFile(id){
+        this.fileList = [];
+        this.signaId = id;
         this.showFile = true;
-        if (!file) return;
-        let fileArray = file.split(',');
-        fileArray.map(res => {
-          this.fileList.push({
-            url: '/api' + res,
-            isImage: true
+        let queryParams = {
+          tableId: id,
+          tableName: 't_transaction_multiplelotsnh',
+        };
+        attachmentList(queryParams).then(response => {
+          response.rows.map(res => {
+            // let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            this.fileList.push({
+              url: '/api'+res.fileUrl,
+              file: new File([], res.fileName,{}),
+              id: res.id
+            });
           })
-        })
+        });
+      },
+      afterRead(file) {
+        // 此时可以自行将文件上传至服务器
+        let params = new FormData();
+        params.append("tableId", this.signaId);
+        params.append("tableName", "t_transaction_multiplelotsnh");
+        params.append("bizPath", "transaction");
+        params.append("fileType", '0');
+        params.append("file", file.file);
+        commonAttach(params).then(response => {
+          this.$notify({ type: 'success', message: '上传成功' });
+        });
+      },
+      deleteFile(file){
+        systemAttachment(file.id).then(res => {
+          this.$notify({ type: 'success', message: '删除成功' });
+        });
       },
       signaImgFun(url) {
         this.signatureImg = url;
@@ -421,7 +447,7 @@
 
         .opera_btn {
           border-radius: 50%;
-
+          padding: 0 10px;
           &.delete {
             background: #df0707;
             margin-left: 10PX;
diff --git a/src/views/sunVillage_info/list_multipleLotsNh_detail.vue b/src/views/sunVillage_info/list_multipleLotsNh_detail.vue
index b897d135..37e44150 100644
--- a/src/views/sunVillage_info/list_multipleLotsNh_detail.vue
+++ b/src/views/sunVillage_info/list_multipleLotsNh_detail.vue
@@ -8,6 +8,7 @@
       <van-divider>标段农户信息</van-divider>
       <van-field v-model="form.contractCode" label="合同编号" placeholder="合同编号" input-align="right" :border="false"/>
       <van-field v-model="form.contractName" label="合同名称" placeholder="合同名称" input-align="right" :border="false"/>
+      <van-field v-model="form.signingMode" label="签订方式" placeholder="签订方式" input-align="right" :border="false"/>
       <van-field v-model="form.farmerCode" label="农户编码" placeholder="农户编码" input-align="right" :border="false"/>
       <van-field v-model="form.memberName" label="农户姓名" placeholder="农户姓名" input-align="right" :border="false"/>
       <van-field v-model="form.idcard" label="身份证号" placeholder="身份证号" input-align="right" :border="false"/>
diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue
index 0a70d629..11355ead 100644
--- a/src/views/sunVillage_info/list_signature.vue
+++ b/src/views/sunVillage_info/list_signature.vue
@@ -4,7 +4,7 @@
       class="header_main"
       :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
     >
-      合同网签
+      流转合同
       <div class="return_btn" @click="onClickLeft"></div>
 <!--      <div class="add_btn" @click="goAdd" v-show="showBtn"></div>-->
     </div>