Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/sunVillage_info/fixedAssets.js

@@ -943,6 +943,14 @@ export function eqbFbfhtwq(data){
     data: data
   })
 }
+//e签宝-发包方批量签署
+export function batchEqbContractSigning(data){
+  return request({
+    url: '/service/cbf/batchEqbContractSigning',
+    method: 'post',
+    data: data
+  })
+}
 //e签宝-合同网签
 export function eqbCbfhtwq(data){
   return request({

src/views/sunVillage_info/list_cbfsq.vue

@@ -86,10 +86,11 @@
         <van-button round block type="primary" v-if="sqbutShow"  @click="cbfsq">
           授权
         </van-button>
-        <van-button round block type="primary" v-if="!sqbutShow"  >
+        <!-- <van-button round block type="primary" v-if="!sqbutShow"  >
           授权完成
-        </van-button>
+        </van-button> -->
       </div>
+      <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_authorized.png" alt="" v-if="!sqbutShow" />
     </div>
   </div>
 </template>
@@ -368,13 +369,6 @@
     border: 5PX solid #e9e9e9;
     border-radius: 100%;
   }
-  .bottomImg{
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    width: 25vw;
-    transform: translate(-50%,-50%);
-  }
   }
   .titBox{
     display: flex;
@@ -399,4 +393,11 @@
     left: 85PX;
   }
   }
+  .bottomImg{
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 50vw;
+    transform: translate(-50%,10%);
+  }
 </style>

src/views/sunVillage_info/list_cbht.vue

@@ -17,7 +17,11 @@
         placeholder="请输入承包方姓名搜索"
         @search="onSearch"
         @clear="onSearch"
-      ></van-search>
+      >
+      </van-search>
+      <div class="search_btn" @click="batchContractSign()" v-if="showPlqs" >
+        <p class="active">批量签署</p>
+      </div>
 
       <van-list
         v-model="loading"
@@ -73,6 +77,10 @@
                 <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>
+              </div>
               <div class="opera_btn" @click="openPopupFile(item.id)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
                 <p>附件</p>
@@ -120,7 +128,7 @@
 </template>
 
 <script>
-  import { listCbht,eqbFbfhtwq, signProcessArchive, signedContractDownload, viewSignedContract, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
+  import { listCbht,eqbFbfhtwq,batchEqbContractSigning, signProcessArchive, signedContractDownload,viewSignedContract, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
 
@@ -135,6 +143,7 @@
         show: false,
         showFile: false,
         htqsShow:false,
+        showPlqs:false,
         noticeUrl:"",
         fileList: [],
         listLength: '0',
@@ -180,7 +189,13 @@
           response.rows.forEach(item => {
             this.applicationList.push(item);
           });
-
+          if( response.rows.length > 0){
+            if( "2" !==  response.rows[0].fbfqszt){
+              this.showPlqs = true;
+            }else{
+              this.showPlqs = false;
+            }
+          }
           if (this.applicationList.length >= response.total) {
             this.finished = true;
             return;
@@ -188,6 +203,7 @@
             this.loading = false;
             this.queryParams.pageNum += 1;
           }
+
         });
       },
       goDetail(id) {
@@ -255,6 +271,22 @@
           this.noticeUrl =  response.data;
           this.htqsShow = true;
         });
+      },
+      batchContractSign(val){
+        this.$toast.loading({
+          message: "数据处理中",
+          forbidClick: true,
+          duration: 10000000000,
+        });
+        batchEqbContractSigning(val).then(response => {
+          this.$toast.clear();
+          this.$toast.success('批量签署完成');
+          let _this = this;
+          setTimeout(function(){
+            _this.confirmn();
+          },3000)
+
+        });
 
       },
       // 生成签字图
@@ -393,7 +425,23 @@
         top: 36px;
       }
     }
-
+  .search_btn{
+    background: rgba(255,255,255,.5);
+    width: 25%;
+    border-radius: 50PX;
+    margin-left: 10PX;
+    margin-bottom: 5px;
+    padding: 2PX;
+  .active{
+    background-image: linear-gradient(to right,#c6fe8b,#48e5a2);
+    color: #ffffff;
+    border-radius: 50PX;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
+  }
     .record_main {
       padding: 30px 22px;
 

src/views/sunVillage_info/list_fbfsq.vue

@@ -33,6 +33,7 @@
           授权
         </van-button>
       </div>
+      <img class="bottomImg" src="../../assets/images/sunVillage_info/employer_authorized.png" alt="" v-if="form.personAccountId && form.companyAccountId" />
     </div>
   </div>
 </template>
@@ -163,5 +164,13 @@
     /deep/ .van-cell--required::before {
       left: 85PX;
     }
+
+    .bottomImg{
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      width: 50vw;
+      transform: translate(-50%,10%);
+    }
   }
 </style>