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 batchEqbContractSignProcess(data){
+  return request({
+    url: '/service/cbf/batchEqbContractSignProcess',
+    method: 'post',
+    data: data
+  })
+}
 //e签宝-发包方批量签署
 export function batchEqbContractSigning(data){
   return request({

src/api/sunVillage_info/sysCbf.js

@@ -82,5 +82,12 @@ export function eqbEmpower(data){
     data: data
   })
 }
+//承包合同相关统计
+export function cbfDataStatistics(){
+  return request({
+    url: '/service/cbf/cbfDataStatistics',
+    method: 'get'
+  })
+}
 
 

src/views/sunVillage_info/list_cbf.vue

@@ -36,10 +36,10 @@
           </div>
           <template #right>
             <div class="operation">
-              <div class="opera_btn" @click="openPopup(item.id)" v-if="item.signingMode == '线上' && 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> -->
               <!-- <div class="opera_btn" v-if="item.signingMode == '线上' && item.attachement !=  null " @click="$router.push({path:'/sunVillage_info/list_signature_pdf',query: {id:item.id,type:$route.query.type}})">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
@@ -52,10 +52,10 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="30">
                 <p>公示结果签名</p>
               </div>
-              <div class="opera_btn">
+              <!-- <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
-              </div>
+              </div> -->
               <div class="opera_btn" @click="openPopupFile(item.id)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
                 <p>附件</p>

src/views/sunVillage_info/list_cbht.vue

@@ -19,9 +19,6 @@
         @clear="onSearch"
       >
       </van-search>
-      <div class="search_btn" @click="batchContractSign()" v-if="showPlqs" >
-        <p class="active">批量签署</p>
-      </div>
 
       <van-list
         v-model="loading"
@@ -77,10 +74,6 @@
                 <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>
@@ -128,7 +121,7 @@
 </template>
 
 <script>
-  import { listCbht,eqbFbfhtwq,batchEqbContractSigning, signProcessArchive, signedContractDownload,viewSignedContract, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
+  import { listCbht,eqbFbfhtwq, signProcessArchive, signedContractDownload,viewSignedContract, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
 
@@ -143,7 +136,6 @@
         show: false,
         showFile: false,
         htqsShow:false,
-        showPlqs:false,
         noticeUrl:"",
         fileList: [],
         listLength: '0',
@@ -185,17 +177,16 @@
       },
       getList() {
         this.loading = true;
+        let wcStatus  = this.$route.query.wcStatus;
+        if(wcStatus){
+          this.$set(this.queryParams, 'signingStatus',"9");
+        }else{
+          this.$set(this.queryParams, 'signingStatus',null);
+        }
         listCbht(this.queryParams).then(response => {
           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;
@@ -272,23 +263,7 @@
           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)
 
-        });
-
-      },
       // 生成签字图
       handleGenerate() {
         this.$refs.esign

src/views/sunVillage_info/list_contract_signature.vue

@@ -12,10 +12,10 @@
           <p class="tit">发包方</p>
         </div>
         <!--    已授权    -->
-        <img v-if="false" src="../../assets/images/sunVillage_info/list_contract_signature_icon_09.png" style="width: 33%;" />
+        <img v-if="form.fbfsfsq" src="../../assets/images/sunVillage_info/list_contract_signature_icon_09.png" style="width: 33%;" />
 
         <!--    未授权    -->
-        <p class="top_main_btn">进入授权 ></p>
+        <p class="top_main_btn"  v-if="!form.fbfsfsq" @click="$router.push({name:'sunVillageInfoListFbfsq'})">进入授权 ></p>
       </div>
 
       <!--    承包方    -->
@@ -23,7 +23,7 @@
         <div class="titBox">
           <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
           <p class="tit">承包方</p>
-          <p class="tt_num">共<span>100</span>户</p>
+          <p class="tt_num">共<span>{{form.cbfzhs}}</span>户</p>
         </div>
 
         <div class="list_main_content">
@@ -33,10 +33,10 @@
                 <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_04.png" style="width:12PX;height:12PX;"/>
               </div>
               <p>未审核</p>
-              <p>80%</p>
+              <p>{{form.cbfwshhsbfb}}</p>
             </div>
-            <p class="list_main_block_num"><span>80</span>户</p>
-            <p class="list_main_block_btn">进入查看 ></p>
+            <p class="list_main_block_num"><span>{{form.cbfwshhs}}</span>户</p>
+            <p class="list_main_block_btn"  @click="$router.push({name:'sunVillageInfoListContractor',query:{status:true}})">进入查看 ></p>
           </div>
 
           <div class="list_main_block">
@@ -45,10 +45,10 @@
                 <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_05.png" style="width:12PX;height:12PX;"/>
               </div>
               <p>未授权</p>
-              <p>80%</p>
+              <p>{{form.cbfwsqhsbfb}}</p>
             </div>
-            <p class="list_main_block_num"><span>80</span>户</p>
-            <p class="list_main_block_btn">进入查看 ></p>
+            <p class="list_main_block_num"><span>{{form.cbfwsqhs}}</span>户</p>
+            <p class="list_main_block_btn" @click="$router.push({name:'sunVillageInfoListContractor',query:{sqStatus:true}})">进入查看 ></p>
           </div>
         </div>
 
@@ -59,6 +59,7 @@
         <div class="titBox">
           <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_03.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
           <p class="tit">承包合同</p>
+          <p class="tt_num" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:false}})">进入合同 ></p>
         </div>
         <div class="list_main_content">
           <div class="list_main_block">
@@ -67,10 +68,10 @@
                 <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_06.png" style="width:12PX;height:12PX;"/>
               </div>
               <p>筹备中</p>
-              <p>80%</p>
+              <p>{{form.htcbzfsbfb}}</p>
             </div>
-            <p class="list_main_block_num"><span>80</span>户</p>
-            <p class="list_main_block_btn">转入待签 ></p>
+            <p class="list_main_block_num"><span>{{form.htcbzfs}}</span>份</p>
+            <p class="list_main_block_btn" v-if="form.htcbzfs > 0" @click="batchEqbContractSignProcess">转入待签 ></p>
           </div>
 
           <div class="list_main_block">
@@ -79,10 +80,10 @@
                 <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_07.png" style="width:12PX;height:12PX;"/>
               </div>
               <p>双方待签</p>
-              <p>80%</p>
+              <p>{{form.htdqfsbfb}}</p>
             </div>
-            <p class="list_main_block_num"><span>80</span>户</p>
-            <p class="list_main_block_btn">批量签署 ></p>
+            <p class="list_main_block_num"><span>{{form.htdqfs}}</span>份</p>
+            <p class="list_main_block_btn" v-if="form.htdqfs > 0" @click="batchContractSign">批量签署 ></p>
           </div>
 
           <div class="list_main_block">
@@ -91,10 +92,10 @@
                 <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_08.png" style="width:12PX;height:12PX;"/>
               </div>
               <p>已完成</p>
-              <p style="background-color: #d2f1d1;color: #30bf2c;">80%</p>
+              <p style="background-color: #d2f1d1;color: #30bf2c;">{{form.htywcfsbfb}}</p>
             </div>
-            <p class="list_main_block_num"><span>80</span>户</p>
-            <p class="list_main_block_btn">进入查看 ></p>
+            <p class="list_main_block_num"><span>{{form.htywcfs}}</span>份</p>
+            <p class="list_main_block_btn" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:true}})">进入查看 ></p>
           </div>
         </div>
       </div>
@@ -103,20 +104,56 @@
 </template>
 
 <script>
+  import { cbfDataStatistics} from "@/api/sunVillage_info/sysCbf";
+  import { batchEqbContractSigning,batchEqbContractSignProcess} from "@/api/sunVillage_info/fixedAssets";
   import $ from "jquery";
   import Cookies from "js-cookie";
   export default {
     name: "sunVillageInfoListContractSignature",
     data() {
       return {
-
+            form:{},
       };
     },
     created() {
-
+      this.getData();
     },
     methods: {
-
+      getData(){
+        cbfDataStatistics().then(res=>{
+          this.form = res.data;
+        });
+      },
+      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.getData();
+          },3000)
+        });
+      },
+      batchEqbContractSignProcess(val){
+        this.$toast.loading({
+          message: "数据处理中",
+          forbidClick: true,
+          duration: 10000000000,
+        });
+        batchEqbContractSignProcess(val).then(response => {
+          this.$toast.clear();
+          this.$toast.success('转入待签完成');
+          let _this = this;
+          setTimeout(function(){
+            _this.getData();
+          },3000)
+        });
+      },
     },
   }
 </script>

src/views/sunVillage_info/list_contractor.vue

@@ -64,16 +64,24 @@
          countcbf:0,
          queryParams:{
            pageNum: 1,
-           pageSize: 10,
+           pageSize: 15,
            cbfbm:null},
          value:'',
        };
      },
      created() {
-       this.getCbfCount();
      },
      methods: {
        getCbfCount(){
+         let status  = this.$route.query.status;
+         let sqStatus  = this.$route.query.sqStatus;
+         if(status){
+           this.$set(this.queryParams, 'params',{gsqz:false});
+         }else if(sqStatus){
+           this.$set(this.queryParams,'params',{cbfsq:false});
+         }else{
+           this.$set(this.queryParams, 'params',null);
+         }
          getList(this.queryParams).then(res=>{
            this.cbfList = res.rows;
            if(this.cbfList.length >= res.total){
@@ -90,7 +98,16 @@
           let params = {
             "cbfbm":this.queryParams.cbfbm,
             "pageNum": this.countcbf+1,
-            "pageSize":10,
+            "pageSize":15,
+          }
+          let status  = this.$route.query.status;
+          let sqStatus  = this.$route.query.sqStatus;
+          if(status){
+            this.$set(params, 'params',{gsqz:false});
+          }else if(sqStatus){
+            this.$set(params,'params',{cbfsq:false});
+          }else{
+            this.$set(params, 'params',null);
           }
           getList(params).then((response) => {
             if(response.rows.length>0&&this.cbfList.length<response.total){