承包网签优化

src/api/sunVillage_info/sysCbf.js

@@ -16,7 +16,13 @@ export function getCbfList(data){
     params:data
   })
 }
-
+// 获取承包方详情
+export function getCbfById(id) {
+  return request({
+    url: '/service/cbf/get/' + id,
+    method: 'get'
+  });
+}
 //查询承包地块列表
 export function getCbdkms(data){
   return request({

src/views/sunVillage_info/list_cbfsq.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main" >
-      承包方授权
+      {{this.$route.query.shStatus?'承包方审核':'承包方授权'}}
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div class="list_main">
@@ -51,7 +51,7 @@
       <van-cell title="公示审核签字" style="color: #646566;">
         <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
           <template #label>
-            <img :src="'/api'+form.gsjgqz" width="10%" alt="" v-if="form.gsjgqz" >
+            <img :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
           </template>
         </van-field>
       </van-cell>
@@ -83,9 +83,11 @@
 <!--      <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" v-if="sqbutShow"  @click="cbfsq">
+        <van-button round block type="primary" v-if="sqbutShow && !cbfsqShow && !cbfshShow"  @click="cbfsq">
           授权
         </van-button>
+        <img class="bottomImg" v-if="sqbutShow && cbfsqShow" src="../../assets/images/sunVillage_info/cbfwsq.png" alt=""  />
+        <img class="bottomImg" v-if="sqbutShow && cbfshShow" src="../../assets/images/sunVillage_info/cbfwsh.png" alt=""  />
         <!-- <van-button round block type="primary" v-if="!sqbutShow"  >
           授权完成
         </van-button> -->
@@ -96,7 +98,7 @@
 </template>
 
 <script>
-  import { getCbfList,eqbEmpower} from "@/api/sunVillage_info/sysCbf";
+  import { getCbfList,getCbfById,eqbEmpower} from "@/api/sunVillage_info/sysCbf";
   import FieldSelect from "@/components/form/FieldSelect";
   import Cookies from "js-cookie";
   import $ from "jquery";
@@ -108,8 +110,10 @@
         form:{},
         showForm2:false,
         showesign:false,
-        sqbutShow:false,
-        sysFarmer:JSON.parse(Cookies.get('user')),
+        sqbutShow:true,
+        cbfsqShow:false,
+        cbfshShow:false,
+        sysFarmer:null,
         zjlxName:"",
         cbfTypeName:"",
         surveyStatusName:"",
@@ -129,7 +133,33 @@
       };
     },
     created() {
-      this.getSysCfb();
+      if(this.$route.query.sqStatus){
+        getCbfById(this.$route.query.id).then(response => {
+          this.form = response.data;
+          if(this.form.accountId != null && this.form.accountId !== ""){
+            this.sqbutShow = false;
+          }else{
+            this.cbfsqShow = true;
+            this.sqbutShow = true;
+          }
+          this.getDictValue();
+        });
+
+      }else if(this.$route.query.shStatus){
+        getCbfById(this.$route.query.id).then(response => {
+          this.form = response.data;
+          if(this.form.gsshqz != null && this.form.gsshqz !== ""){
+            this.sqbutShow = false;
+          }else{
+            this.cbfshShow = true;
+            this.sqbutShow = true;
+          }
+          this.getDictValue();
+        });
+      }else{
+       this.sysFarmer = JSON.parse(Cookies.get('user'));
+        this.getSysCfb();
+      }
     },
     methods: {
       InitOptions() {
@@ -149,44 +179,49 @@
       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;
+            }else{
+              this.sqbutShow = true;
             }
-            this.getDicts("cert_type").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.cbfzjlx) {
-                  _this.zjlxName = item.dictLabel;
-                }
-              })
-            });
-            this.getDicts("cbf_type").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.cbflx) {
-                  _this.cbfTypeName = item.dictLabel;
-                }
-              })
-            });
-            this.getDicts("confirmed_survey_status").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.surveyStatus) {
-                  _this.surveyStatusName = item.dictLabel;
-                }
-              })
-            });
-            this.getDicts("sys_yes_no").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.isDeposit) {
-                  _this.isDepositName = item.dictLabel;
-                }
-              })
-            });
+            this.getDictValue();
           }
 
         });
       },
+      getDictValue(){
+        let _this = this;
+        this.getDicts("cert_type").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.cbfzjlx) {
+              _this.zjlxName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("cbf_type").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.cbflx) {
+              _this.cbfTypeName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("confirmed_survey_status").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.surveyStatus) {
+              _this.surveyStatusName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("sys_yes_no").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.isDeposit) {
+              _this.isDepositName = item.dictLabel;
+            }
+          })
+        });
+      }
     },
   }
 </script>

src/views/sunVillage_info/list_cbht_detail.vue

@@ -5,7 +5,7 @@
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div class="list_main">
-      <van-divider>承包合同合同信息</van-divider>
+      <van-divider>承包合同信息</van-divider>
       <van-field v-model="form.cbhtbm" label="承包合同编码" placeholder="承包合同编码" input-align="right" :border="false"/>
       <van-field v-model="form.ycbhtbm" label="原承包合同编码" placeholder="原承包合同编码" input-align="right" :border="false"/>
       <van-field v-model="form.cbflx" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false"/>

src/views/sunVillage_info/list_contract_signature.vue

@@ -147,7 +147,7 @@
         });
         batchEqbContractSignProcess(val).then(response => {
           this.$toast.clear();
-          this.$toast.success('转入待签完成');
+          this.$toast.success(response.data);
           let _this = this;
           setTimeout(function(){
             _this.getData();

src/views/sunVillage_info/list_contractor.vue

@@ -1,7 +1,7 @@
  <template>
      <div class="home_wrapper">
        <div class="header_main">
-           承包方审核
+            {{ this.$route.query.sqStatus?'承包方授权':'承包方审核'}}
            <div class="return_btn" @click="onClickLeft"></div>
        </div>
        <div class="search_info">
@@ -19,7 +19,7 @@
            @load="onRefreshContractor"
          >
            <van-swipe-cell v-for="(item,index) in cbfList" :key="'cbf'+index">
-             <div class="item"  @click="$router.push({path:'/sunVillage_info/list_contractor_single_process',query:{item:item,status:false}})">
+             <div class="item"  @click="detailsClick(item)">
                <div class="info">
                  <div class="title">
                    <i class="icon_box"></i>
@@ -34,7 +34,7 @@
                  <img  :src="'/api'+item.gsshqz" width="100%" alt="" v-if="item.gsshqz" >
                </div>
              </div>
-             <template #right>
+             <template #right v-if="!$route.query.sqStatus">
                <div class="operation">
                  <div class="opera_btn" @click="$router.push({path:'/sunVillage_info/list_contractor_single_process',query:{item:item,status:true}})">
                    <img src="../../assets/images/sunVillage_info/contractor_icon_07.png" alt="" width="25">
@@ -93,6 +93,13 @@
            }
          });
        },
+       detailsClick(item){
+         if(this.$route.query.sqStatus){
+           this.$router.push({path:'/sunVillage_info/list_cbfsq',query:{id:item.id,sqStatus:true}})
+         }else{
+           this.$router.push({path:'/sunVillage_info/list_cbfsq',query:{id:item.id,shStatus:true}})
+         }
+       },
        onRefreshContractor(){
         if(this.loading){
           let params = {