承包网签、宅基地调查优化

src/api/sunVillage_info/fixedAssets.js

@@ -791,7 +791,7 @@ export function signProcessArchive(id) {
 // 签署合同下载
 export function signedContractDownload(id) {
   return request({
-    url: '/service/cbht/sign/download/' + id,
+    url: '/open/villageAffairs/public/sign/download/' + id,
     method: 'get'
   });
 }
@@ -799,7 +799,7 @@ export function signedContractDownload(id) {
 // 签字合同预览
 export function viewSignedContract(id) {
   return request({
-    url: '/service/cbht/sign/view/' + id,
+    url: '/open/villageAffairs/public/sign/view/' + id,
     method: 'get'
   });
 }

src/views/homesteadSurvey/list2.vue

@@ -86,26 +86,26 @@
       </template>
     </van-cell>
     </van-list>
-    <van-dialog v-model="outsideOpen"  title="外村农户" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" >
-      <van-row>
-        <van-col span="24">
-          <van-field  v-model="outsideForm.nhdm" label="外村农户" placeholder="外村农户" input-align="right"  required :rules="[{ required: true }]"  @click="showWcnh = true"/>
-          <van-popup  v-model="showWcnh" position="bottom">
-            <van-search placeholder="请输入" v-model="hnncValue" />
-            <van-picker
-              show-toolbar
-              :columns="wcnhnewList"
-              @confirm="nhChange"
-              value-key="nhValue"
-              @cancel="showWcnh = false"
-            />
-          </van-popup>
-          <br/>
-          <br/>
-        </van-col>
-
-      </van-row>
+    <van-dialog v-model="outsideOpen" title="外村农户"  show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" >
+    <wcnhList  style="height: 600px;overflow: auto;"  ref="wcnh"/>
+      <!--      <van-row>-->
+<!--        <van-col span="24">-->
+<!--          <van-field  v-model="outsideForm.nhdm" label="外村农户" placeholder="外村农户" input-align="right"  required :rules="[{ required: true }]"  @click="showWcnh = true"/>-->
+<!--          <van-popup  v-model="showWcnh" position="bottom">-->
+<!--            <van-search placeholder="请输入" v-model="hnncValue" />-->
+<!--            <van-picker-->
+<!--              show-toolbar-->
+<!--              :columns="wcnhnewList"-->
+<!--              @confirm="nhChange"-->
+<!--              value-key="nhValue"-->
+<!--              @cancel="showWcnh = false"-->
+<!--            />-->
+<!--          </van-popup>-->
+<!--          <br/>-->
+<!--          <br/>-->
+<!--        </van-col>-->
 
+<!--      </van-row>-->
 
     </van-dialog>
 <!--    </van-pull-refresh>-->
@@ -124,12 +124,14 @@
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
     import {deptGetId,} from "@/api/homestead/index";
+    import wcnhList from "@/views/homesteadSurvey/wcnhList";
     import $ from "jquery";
     import {Dialog} from "vant";
     import {ref} from "vue";
     import axios from "axios";
     export default {
       name: "homesteadList",
+      components: { wcnhList},
       data() {
         return {
           loading1:false,
@@ -819,9 +821,7 @@
         },
         /** 新增外村农户按钮操作 */
         onClickWcnh(){
-          this.getWcnhList().then((resp) => {
-            this.outsideOpen = true;
-          });
+          this.outsideOpen = true;
         },
         getWcnhList() {
           return queryHomesteadnhhncyList({
@@ -4942,13 +4942,19 @@
         },
         /** 外村农户提交按钮 */
         outsideSubmitForm() {
-          addOutsidenhhncy(this.outsideForm).then(response => {
-            if(response.code != 200) throw response.msg;
-            this.$toast("新增成功");
-            this.outsideOpen = false;
-            this.getList();
-            this.outDiglogStatus = true;
-          }).catch(() => this.outDiglogStatus = true);
+          let wcnhData = this.$refs.wcnh.wcnhData;
+          if(wcnhData == null){
+            this.$toast("请选择外村农户！");
+          }else {
+            addOutsidenhhncy(wcnhData).then(response => {
+              if(response.code != 200) throw response.msg;
+              this.$toast("新增成功");
+              this.outsideOpen = false;
+              this.getList();
+              this.outDiglogStatus = true;
+            }).catch(() => this.outDiglogStatus = true);
+          }
+
         },
         closeSearchBox(){
           this.showSearch = false ;

src/views/sunVillage_info/list_cbf.vue

@@ -44,7 +44,7 @@
                 <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.cbfqszt =='2'"  @click="contractSign(item)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.cbfqszt !='2' && item.signingStatus !=='合同筹备'"  @click="contractSign(item)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>合同网签</p>
               </div>
@@ -52,6 +52,15 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>公示结果签名</p>
               </div>
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.signingStatus !=='合同筹备' && item.signingStatus !=='双方待签'" @click="contractView(item.id)">
+                <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.signingStatus === '合同归档'"
+                   @click="handleDownload(item.id)">
+                <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>
@@ -102,7 +111,7 @@
 </template>
 
 <script>
-  import { getCbf, eqbCbfhtwq,getCbhtList, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
+  import { getCbf, eqbCbfhtwq,getCbhtList,signedContractDownload,viewSignedContract, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
   import Cookies from "js-cookie";
@@ -307,6 +316,29 @@
             this.$toast.fail('请签名后再保存签字');
           });
       },
+      contractView(id) {
+        viewSignedContract(id).then(response => {
+          if (response.code === 200) {
+            this.noticeUrl = response.data;
+            this.htqsShow = true;
+          }
+        });
+      },
+      // 签署合同下载
+      handleDownload(id) {
+        this.$dialog.confirm({
+          message: '是否确认下载签署合同？',
+        }).then(() => {
+          // on confirm
+          signedContractDownload(id).then(res => {
+            if (res.code === 200) {
+              window.location.href = res.data;
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
       dataURLtoBlob(dataurl, filename = 'file') {
         let arr = dataurl.split(',')
         let mime = arr[0].match(/:(.*?);/)[1]

src/views/sunVillage_info/list_cbfsq.vue

@@ -75,13 +75,13 @@
           </template>
         </van-field>
       </van-cell>
-      <van-field readonly v-model="form.hcgfsl	" label="户持股份(份额)数量" placeholder="户持股份(份额)数量	" input-align="right" :border="false" />
-      <van-field readonly v-model="form.hcgfzjtqqtdbl	" label="户持股份(份额)比例" placeholder="户持股份(份额)比例	" input-align="right" :border="false" />
-      <van-field readonly v-model="form.hcgfzjtqqtdmj	" label="户持股份(份额)面积" placeholder="户持股份(份额)面积" input-align="right" :border="false" />
-      <van-field readonly v-model="surveyStatusName" label="确权调查状态" placeholder="确权调查状态" input-align="right" :border="false" />
-      <van-field readonly v-model="form.surveyRemark" label="确权调查备注" placeholder="确权调查备注" input-align="right" :border="false" />
-      <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" />
+<!--      <van-field readonly v-model="form.hcgfsl	" label="户持股份(份额)数量" placeholder="户持股份(份额)数量	" input-align="right" :border="false" />-->
+<!--      <van-field readonly v-model="form.hcgfzjtqqtdbl	" label="户持股份(份额)比例" placeholder="户持股份(份额)比例	" input-align="right" :border="false" />-->
+<!--      <van-field readonly v-model="form.hcgfzjtqqtdmj	" label="户持股份(份额)面积" placeholder="户持股份(份额)面积" input-align="right" :border="false" />-->
+<!--      <van-field readonly v-model="surveyStatusName" label="确权调查状态" placeholder="确权调查状态" input-align="right" :border="false" />-->
+<!--      <van-field readonly v-model="form.surveyRemark" label="确权调查备注" placeholder="确权调查备注" input-align="right" :border="false" />-->
+<!--      <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">
           授权
@@ -140,7 +140,6 @@
       },
       /*承包方授权*/
       cbfsq(){
-        console.info(3333333333);
         eqbEmpower(this.form).then(response => {
           if(response.code === 200 ){
             this.sqbutShow = false;
@@ -156,7 +155,7 @@
             if(this.form.accountId != null && this.form.accountId !== ""){
               this.sqbutShow = false;
             }
-            this.getDicts("zjlx").then(response => {
+            this.getDicts("cert_type").then(response => {
               response.data.forEach(function (item) {
                 if (item.dictValue ===  _this.form.cbfzjlx) {
                   _this.zjlxName = item.dictLabel;

src/views/sunVillage_info/list_cbht.vue

@@ -84,10 +84,7 @@
       </van-list>
     </div>
     <van-dialog v-model="htqsShow" title="合同签署" confirmButtonText="关闭" @confirm="confirmn">
-<!--      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>-->
-      <object width="100%" height="600" :data="noticeUrl" type="text/html">
-             Alternative Content-->
-        </object>
+      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>
             </van-dialog>
             <!-- 签字弹出层 -->
     <van-popup v-model="show" closeable position="right" :style="{ height: '100%' }">
@@ -181,7 +178,7 @@
       getList() {
         this.loading = true;
         let wcStatus  = this.$route.query.wcStatus;
-        if(wcStatus){
+        if(wcStatus === 'true'){
           this.$set(this.queryParams, 'signingStatus',"3");
         }else{
           this.$set(this.queryParams, 'signingStatus',null);

src/views/sunVillage_info/list_chronicles_process.vue

@@ -146,7 +146,11 @@
         $('#canvasTT').css('display', 'none');
       },
       onSign(){
-        this.showesign = true;
+        if(this.form.gsjs != null && this.form.gsjs !== ""){
+          this.showesign = true;
+        }else{
+          this.$toast.fail('请填写记事内容！');
+        }
       },
       // 清空画板
       handleReset() {

src/views/sunVillage_info/list_contract_signature.vue

@@ -59,7 +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>
+          <p class="tt_num" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:'false'}})">进入合同 ></p>
         </div>
         <div class="list_main_content">
           <div class="list_main_block">
@@ -95,7 +95,7 @@
               <p style="background-color: #d2f1d1;color: #30bf2c;">{{form.htywcfsbfb}}</p>
             </div>
             <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>
+            <p class="list_main_block_btn" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:'true'}})">进入查看 ></p>
           </div>
         </div>
       </div>

src/views/sunVillage_info/list_contractor_process.vue

@@ -174,7 +174,17 @@
         $('#canvasTT').css('display', 'none');
       },
       onSign(){
-        this.showesign = true;
+        if(this.form.gsjsrqz == null || this.form.gsjsrqz === ""){
+          this.$toast.fail('请先完成承包方记事！');
+        }else{
+          if(this.form.gsshyj != null && this.form.gsshyj !== ""){
+            this.showesign = true;
+          }else{
+            this.$toast.fail('请填写审核意见！');
+          }
+
+        }
+
       },
       // 清空画板
       handleReset() {

src/views/sunVillage_info/list_employer_process.vue

@@ -138,7 +138,11 @@
         $('#canvasTT').css('display', 'none');
       },
       onSign(){
-        this.showesign = true;
+        if(this.form.shyj != null && this.form.shyj !== ""){
+          this.showesign = true;
+        }else{
+          this.$toast.fail('请填写审核意见！');
+        }
       },
       // 清空画板
       handleReset() {