From f0599dfd07cb6ba899889dcb1834bfa3084bad4c Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 28 Mar 2023 11:35:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E7=BD=91=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |  27 +
 .../images/sunVillage_info/index_icon_10.png  | Bin 0 -> 3655 bytes
 src/router/index.js                           |  18 +
 .../sunVillage_info/list_multipleLots.vue     | 526 ++++++++++++++++++
 .../sunVillage_info/list_multipleLots_add.vue | 202 +++++++
 5 files changed, 773 insertions(+)
 create mode 100644 src/assets/images/sunVillage_info/index_icon_10.png
 create mode 100644 src/views/sunVillage_info/list_multipleLots.vue
 create mode 100644 src/views/sunVillage_info/list_multipleLots_add.vue

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 90adfb3b..ee62369c 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -682,3 +682,30 @@ export function contractGet(query,id) {
     params:query
   })
 }
+
+// 查询多标段合同列表
+export function listMultiplelots(query) {
+  return request({
+    url: '/transaction/multiplelots/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询多标段合同详情
+export function getMultiplelots(query, id) {
+  return request({
+    url: '/transaction/multiplelots/get/' + id,
+    method: 'get',
+    params: query
+  })
+}
+
+// 标段合同甲方签字
+export function multipleLotsFirstSign(data, id) {
+  return request({
+    url: '/transaction/multiplelots/firstSign/' + id,
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/assets/images/sunVillage_info/index_icon_10.png b/src/assets/images/sunVillage_info/index_icon_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9d28cf36f49aecf49be204826b91555da2461bc
GIT binary patch
literal 3655
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

literal 0
HcmV?d00001

diff --git a/src/router/index.js b/src/router/index.js
index aec85a45..a2d4183f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3821,6 +3821,24 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_official'], resolve)
   },
+  { ////阳光村务（新）-- 标段合同网签
+    path: '/sunVillage_info/list_multipleLots',
+    name: 'sunVillageInfoListMultipleLots',
+    meta: {
+      title: '标段合同网签',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_multipleLots'], resolve)
+  },
+  { ////阳光村务（新）-- 标段合同网签
+    path: '/sunVillage_info/list_multipleLots_add',
+    name: 'sunVillageInfoListMultipleLotsAdd',
+    meta: {
+      title: '标段合同网签',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_multipleLots_add'], resolve)
+  },
   { ////阳光村务（新）-- 宅基地申请
     path: '/sunVillage_info/homeApplication/applicationList',
     name: 'sunVillageInfoApplicationList',
diff --git a/src/views/sunVillage_info/list_multipleLots.vue b/src/views/sunVillage_info/list_multipleLots.vue
new file mode 100644
index 00000000..ebe3fc97
--- /dev/null
+++ b/src/views/sunVillage_info/list_multipleLots.vue
@@ -0,0 +1,526 @@
+<template>
+  <div class="home_wrapper">
+    <div
+      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>
+
+    <div class="list_main">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList"
+      >
+        <van-swipe-cell v-for="item in applicationList" :key="item.id" :disabled="item.firstIsSign === '是'">
+          <div class="item" @click="goDetail(item.id)">
+            <div class="info">
+              <div class="title">
+                <i class="icon_box" v-if="item.firstSigning == null"></i>
+                <i class="icon_box1" v-if="item.firstSigning != null"></i>
+                <p class="news_title" :style="{'color': item.firstSigning != null ? '#2bc30c' : '#eb1616'}">{{item.contractCode}}</p>
+                <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>
+              </div>
+              <div class="time">
+                <p>{{item.contractName}}</p>
+                <p style="color:#eb1616;font-weight: bold;"><span style="font-size: 12px;">￥</span>{{item.contractMoney.toFixed(2)}}</p>
+              </div>
+            </div>
+          </div>
+          <template #right>
+            <div class="operation">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.firstIsSign =='否'"
+                   @click="openPopup(item.id)">
+                <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)">
+                <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
+                <p>线下合同</p>
+              </div> -->
+            </div>
+          </template>
+        </van-swipe-cell>
+      </van-list>
+    </div>
+
+    <!-- 签字弹出层 -->
+    <van-popup v-model="show" closeable position="right" :style="{ height: '100%' }">
+      <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+          />
+        </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"
+             style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <div class="signature-footer">
+          <van-button @click="handleGenerate" type="info" size="small">保存签字</van-button>
+          <van-button @click="handleReset" class="clearBtn" type="info" plain size="small">清空画板</van-button>
+        </div>
+      </van-cell-group>
+    </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>
+  </div>
+</template>
+
+<script>
+  import { listMultiplelots, multipleLotsFirstSign } from "@/api/sunVillage_info/fixedAssets";
+  import vueEsign from "vue-esign";
+  import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
+  import $ from "jquery";
+
+  export default {
+    name: "sunVillageInfoListMultipleLots",
+    components: {vueEsign, signatureUploadSignature},
+    data() {
+      return {
+        applicationList: [],
+        loading: false,
+        finished: false,
+        show: false,
+        showFile: false,
+        fileList: [],
+        listLength: '0',
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          translate_dict: 1,
+        },
+        showBtn: true,
+
+        signatureImg: '',
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
+        signaId: '',
+        height: null
+      };
+    },
+    created() {
+      if (this.$route.query.type == 'code') {
+        this.showBtn = false;
+      }
+      this.height = window.screen.height * 1.28 - 20;
+    },
+    methods: {
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      getList() {
+        listMultiplelots(this.queryParams).then(response => {
+          this.applicationList = response.rows;
+
+          if (this.applicationList.length >= response.total) {
+            this.finished = true;
+            return;
+          } else {
+            this.loading = false;
+            this.queryParams.pageNum += 1;
+          }
+        });
+      },
+      goDetail(id) {
+        this.$router.push({
+          path: '/sunVillage_info/list_multipleLots_add',
+          query: { id: id }
+        })
+      },
+      openPopup(id, url) {
+        this.show = true;
+        this.signaId = id;
+      },
+      openPopupFile(file) {
+        this.showFile = true;
+        if (!file) return;
+        let fileArray = file.split(',');
+        fileArray.map(res => {
+          this.fileList.push({
+            url: '/api' + res,
+            isImage: true
+          })
+        })
+      },
+      signaImgFun(url) {
+        this.signatureImg = url;
+      },
+      // 清空画板
+      handleReset() {
+        this.$refs.esign.reset();
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图
+      handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData()  // 创建form对象
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+
+            multipleLotsFirstSign(param, this.signaId).then(response => {
+              this.$notify({type: 'success', message: '签字成功'});
+              this.show = false;
+              location.reload();
+            });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob(dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .home_wrapper {
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+
+      .add_btn {
+        width: 56.4px;
+        height: 40.8px;
+        background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+        background-size: 47px 34px;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
+
+    .record_main {
+      padding: 30px 22px;
+
+      .record_det {
+        height: 38px;
+        line-height: 38px;
+        display: flex;
+        justify-content: space-between;
+
+        .year_l {
+          font-size: 30px;
+          display: flex;
+          align-items: center;
+          color: #858585;
+
+          .unit {
+            padding-left: 5px;
+          }
+
+          .icon {
+            width: 23px;
+            height: 12px;
+            display: block;
+            background: url('../../assets/images/sunVillage_info/list_icon_1.png') no-repeat;
+            background-size: 100% 100%;
+            margin-bottom: 4px;
+            margin-right: 8px;
+
+            &.zk {
+              transform: rotate(0deg)
+            }
+
+            &.ss {
+              transform: rotate(180deg)
+            }
+
+          }
+        }
+
+        .total_r {
+          font-size: 26px;
+          letter-spacing: 2px;
+        }
+      }
+
+      .record_list {
+        display: flex;
+        flex-flow: wrap;
+        margin-top: 12PX;
+
+        .flex_block {
+          font-size: 30px;
+          color: #878787;
+          padding-right: 30px;
+
+          &.current {
+            color: #4199fe;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+
+    .list_main {
+      padding: 0 22px;
+      margin-top: 15PX;
+
+      .item {
+        border-radius: 30px;
+        background: #fff;
+        box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+        padding: 25px 32px;
+        margin-bottom: 20px;
+
+        .info {
+          .title {
+            display: flex;
+            font-size: 32px;
+            align-items: center;
+            height: 58px;
+
+            .icon_box {
+              width: 34px;
+              display: block;
+              height: 30px;
+              background: url('../../assets/images/sunVillage_info/signature_icon_01.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+              flex-shrink: 0;
+            }
+
+            .icon_box1 {
+              width: 34px;
+              display: block;
+              height: 30px;
+              background: url('../../assets/images/sunVillage_info/signature_icon_01g.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+              flex-shrink: 0;
+            }
+
+            .news_title {
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 1;
+              word-break: break-all;
+              overflow: hidden;
+            }
+
+            .tips_mark {
+              background: #ffedcd;
+              border-radius: 8px;
+              font-size: 24px;
+              color: #f8a83d;
+              text-align: center;
+              line-height: 34px;
+              flex-shrink: 0;
+              padding: 0 5Px;
+              margin-left: auto;
+            }
+
+            .tips_mark2 {
+              background: #eb1616;
+              border-radius: 8px;
+              font-size: 24px;
+              color: #ffffff;
+              text-align: center;
+              line-height: 34px;
+              flex-shrink: 0;
+              padding: 0 5Px;
+              margin-left: 10PX;
+            }
+          }
+
+          .time {
+            font-size: 16PX;
+            color: #333333;
+            display: flex;
+            align-items: center;
+            margin-top: 5PX;
+            justify-content: space-between;
+
+            .icon_time {
+              width: 25px;
+              height: 25px;
+              background: url('../../assets/images/sunVillage_info/list_icon_4.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+            }
+          }
+        }
+      }
+
+      .operation {
+        display: flex;
+        align-items: center;
+        justify-content: right;
+        text-align: center;
+        border-radius: 30px;
+        background: #fff;
+        box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+        height: 100%;
+        padding: 0 15Px;
+        margin-left: 10PX;
+
+        .opera_btn {
+          border-radius: 50%;
+
+          &.delete {
+            background: #df0707;
+            margin-left: 10PX;
+
+            .icon {
+              width: 22PX;
+              height: 29PX;
+              background: url('../../assets/images/sunVillage_info/signature_icon_03.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+
+          &.edit {
+            background: #79cf13;
+            margin-left: 10PX;
+
+            .icon {
+              width: 26PX;
+              height: 25PX;
+              background: url('../../assets/images/sunVillage_info/signature_icon_02.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+
+          &.view {
+            background: #3494ff;
+            margin-left: 10PX;
+
+            .icon {
+              width: 29PX;
+              height: 21PX;
+              background: url('../../assets/images/sunVillage_info/signature_icon_04.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+
+          &.list {
+            background: #79cf13;
+            margin-left: 10PX;
+
+            .icon {
+              width: 29px;
+              height: 21px;
+              background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+        }
+      }
+    }
+
+    .bottom_tips {
+      font-size: 24px;
+      color: #a7a6a6;
+      text-align: center;
+      margin-top: 32px;
+      background: url('../../assets/images/sunVillage_info/list_icon_8.png') center center no-repeat;
+      background-size: 260px 2px;
+
+      .xs {
+        padding: 0 8px;
+        background: #e9e9e9;
+      }
+    }
+
+    .signature-box {
+      border: 1px dashed #666;
+      margin: 2px 20px;
+      height: 100%;
+      /*canvas{*/
+      /*  height: 100%!important;*/
+      /*}*/
+    }
+
+    .signature-footer {
+      transform: rotate(90deg);
+      width: auto;
+      position: absolute;
+      top: 50%;
+      left: 0PX;
+
+      .clearBtn {
+        margin-left: 15px;
+      }
+    }
+
+    .esigh-result {
+      margin: 15px 20px;
+      // height: 110px;
+      border: 1px solid #666;
+      font-size: 0;
+
+      .imgs {
+        width: 100%;
+      }
+    }
+  }
+</style>
diff --git a/src/views/sunVillage_info/list_multipleLots_add.vue b/src/views/sunVillage_info/list_multipleLots_add.vue
new file mode 100644
index 00000000..7027a223
--- /dev/null
+++ b/src/views/sunVillage_info/list_multipleLots_add.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      标段合同详情
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="list_main">
+      <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.firstParty" label="甲方" placeholder="甲方" input-align="right" :border="false"/>
+      <van-field v-model="form.contractMoney" label="合同金额(元)" placeholder="合同金额(元)" input-align="right" :border="false"/>
+      <van-field v-model="form.startTime" label="开始日期" placeholder="开始日期" input-align="right" :border="false"/>
+      <van-field v-model="form.endTime" label="结束日期" placeholder="结束日期" input-align="right" :border="false"/>
+      <van-field v-model="form.contractDate" label="登记日期" placeholder="登记日期" input-align="right" :border="false"/>
+      <van-field v-model="form.contractionStatus" 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.signingStatus" label="签订状态" placeholder="签订状态" input-align="right" :border="false"/>
+      <van-field v-model="form.contractRemark" label="合同备注" placeholder="合同备注" input-align="right" :border="false"/>
+
+      <van-divider>甲方信息</van-divider>
+      <van-field v-model="form.firstIsSign" label="甲方已签" placeholder="甲方已签" input-align="right" :border="false"/>
+      <van-field v-model="form.firstPartyAt" label="甲方签字日期" placeholder="甲方签字日期" input-align="right" :border="false"/>
+      <van-field label="甲方签字" input-align="right" :border="false" />
+      <img :src="'/api'+form.firstSigning" width="100%" alt="" v-if="form.firstSigning">
+      <van-field label="村级公章" input-align="right" :border="false" />
+      <img :src="'/api'+form.firstSeal" width="100%" alt="" v-if="form.firstSeal">
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import {getMultiplelots} from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        form: {},
+        queryParams: {
+          bookId: '',
+          deptId: ''
+        },
+      };
+    },
+    created() {
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+      this.getDetail();
+    },
+    methods: {
+      getDetail() {
+        let query = {
+          translate_dict: 1
+        };
+        getMultiplelots(query, this.$route.query.id).then((res) => {
+          if (res.code === 200) {
+            this.form = res.data;
+          }
+        })
+      },
+
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  /deep/ .van-button--primary {
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
+
+  .home_wrapper {
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+    }
+
+    .release_head {
+      height: 90px;
+      padding: 0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+
+      .people {
+        flex: 1;
+        display: flex;
+        align-items: center;
+
+        .icon {
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+
+      .time {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .icon {
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+
+    .release_conetnt {
+      padding: 0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+
+      img {
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+
+      p {
+        margin-bottom: 16px;
+      }
+    }
+
+    .list_main {
+      padding: 25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+
+    .titBox {
+      display: flex;
+      align-items: center;
+    }
+
+    .tit {
+      font-size: 36px;
+      font-weight: bold;
+    }
+
+    /deep/ .van-cell {
+      padding-left: 0 !important;
+      padding-right: 0 !important;
+      padding-bottom: 0 !important;
+    }
+
+    /deep/ .van-field__label {
+      /*padding-left: 10PX;*/
+      width: auto;
+      display: flex;
+      align-items: center;
+    }
+
+    /deep/ .van-cell--required::before {
+      left: 85PX;
+    }
+
+    /deep/ .van-field__error-message {
+      display: none;
+    }
+  }
+</style>

From 2a6c9a2c6a5f61e6bff31e3d5a032ee894d5437d Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Tue, 28 Mar 2023 14:38:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=86=9C=E6=88=B7icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/sunVillage_info/index_icon_11.png     | Bin 0 -> 3091 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/index_icon_11.png

diff --git a/src/assets/images/sunVillage_info/index_icon_11.png b/src/assets/images/sunVillage_info/index_icon_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dee98d69ad96d75cfcf276c837d2a688dfdc790
GIT binary patch
literal 3091
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
Bvt|GQ

literal 0
HcmV?d00001


From 810e1c5c2025e787b7ed10e8c0f893902a523db6 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Tue, 28 Mar 2023 16:24:13 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/onlineHome/homestead/circulation.js   |  9 +++
 .../onlineHome/homestead/homeuseycsyjfbz.js   | 54 ++++++++++++++++
 src/api/onlineHome/homestead/programme.js     | 61 +++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 src/api/onlineHome/homestead/homeuseycsyjfbz.js
 create mode 100644 src/api/onlineHome/homestead/programme.js

diff --git a/src/api/onlineHome/homestead/circulation.js b/src/api/onlineHome/homestead/circulation.js
index 549d3036..96f32bcc 100644
--- a/src/api/onlineHome/homestead/circulation.js
+++ b/src/api/onlineHome/homestead/circulation.js
@@ -127,6 +127,15 @@ export function getByLyZjddm(data){
   })
 }
 
+// 宅基地信息条件查询
+export function selectHomesteadObligeeMapList(query) {
+  return request({
+    url: '/home/homesteadshyqr/selectHomesteadObligeeMapList',
+    method: 'get',
+    params: query
+  })
+}
+
 //宅基地使用权流转农户查询
 export function queryHouserBaseNh(query) {
   return request({
diff --git a/src/api/onlineHome/homestead/homeuseycsyjfbz.js b/src/api/onlineHome/homestead/homeuseycsyjfbz.js
new file mode 100644
index 00000000..7ec3bc63
--- /dev/null
+++ b/src/api/onlineHome/homestead/homeuseycsyjfbz.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询有偿计费标准列表
+export function listYcsyjfbz(query) {
+  return request({
+    url: '/home/ycsyjfbz/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出有偿计费标准
+export function exportYcsyjfbz(query) {
+  return request({
+    url: '/home/ycsyjfbz/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询有偿计费标准详细
+export function getYcsyjfbz(id) {
+  return request({
+    url: '/home/ycsyjfbz/get/' + id,
+    method: 'get'
+  })
+}
+
+// 新增有偿计费标准
+export function addYcsyjfbz(data) {
+  return request({
+    url: '/home/ycsyjfbz/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改有偿计费标准
+export function updateYcsyjfbz(data) {
+  return request({
+    url: '/home/ycsyjfbz/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除有偿计费标准
+export function delYcsyjfbz(id) {
+  return request({
+    url: '/home/ycsyjfbz/remove/' + id,
+    method: 'get'
+  })
+}
+
diff --git a/src/api/onlineHome/homestead/programme.js b/src/api/onlineHome/homestead/programme.js
new file mode 100644
index 00000000..8a52ef73
--- /dev/null
+++ b/src/api/onlineHome/homestead/programme.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询村庄规划列表
+export function listProgramme(query) {
+  return request({
+    url: '/home/programme/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询村庄规划预警列表
+export function programmeWarninglist(query) {
+  return request({
+    url: '/home/programme/programmeWarninglist',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询村庄规划详细
+export function getProgramme(id) {
+  return request({
+    url: '/home/programme/get/' + id,
+    method: 'get'
+  })
+}
+
+// 新增村庄规划
+export function addProgramme(data) {
+  return request({
+    url: '/home/programme/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改村庄规划
+export function updateProgramme(data) {
+  return request({
+    url: '/home/programme/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除村庄规划
+export function delProgramme(id) {
+  return request({
+    url: '/home/programme/remove/' + id,
+    method: 'get'
+  })
+}
+
+// 导出村庄规划
+export function exportProgramme(query) {
+  return request({
+    url: '/home/programme/export',
+    method: 'get',
+    params: query
+  })
+}

From 531771963aa2d4c0aa671d6376e9eed851f636cc Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Tue, 28 Mar 2023 16:24:57 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homestead/paidUtilize/paidUtilizeAdd.vue  | 80 +++++++++++++---
 .../homestead/paidUtilize/paidUtilizeList.vue |  4 +-
 .../paidUtilize/paidUtilizeModify.vue         | 93 +++++++++++++------
 3 files changed, 138 insertions(+), 39 deletions(-)

diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue
index e3005349..03c48010 100644
--- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue
+++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue
@@ -106,10 +106,17 @@
           @confirm="onConfirmYcsydqsj"
         />
       </van-popup>
-
-      <van-field v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto">
+        <template #button>
+          <van-button size="small" @click="computeMJ" type="primary">计算</van-button>
+        </template>
+      </van-field>
+      <van-field v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" @change="changeDJ" input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right" label-width="auto">
+        <template #button>
+          <van-button size="small" @click="computeFY" type="primary">计算</van-button>
+        </template>
+      </van-field>
       <van-field v-model="circulation.fkfs" label="付款方式" placeholder="请输入付款方式" input-align="right" label-width="auto"/>
       <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
@@ -132,10 +139,12 @@
 </template>
 
 <script>
-  import { zjdzd } from "@/api/onlineHome/homestead/circulation";
+  import { zjdzd,selectHomesteadObligeeMapList} from "@/api/onlineHome/homestead/circulation";
   import { ycsyAdd  } from "@/api/onlineHome/homestead/paidUtilize";
-  import {  getShyqrs,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
+  import {  getShyqrs,getByLyZjddm} from "@/api/sunVillage_info/homestead/paidExit";
+  import { listYcsyjfbz} from "@/api/onlineHome/homestead/homeuseycsyjfbz";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
+  import {listProgramme} from "@/api/onlineHome/homestead/programme";
   export default {
     name: "paidUtilizeAdd",
     components: {MapGisObtainTc},
@@ -149,11 +158,16 @@
         zjdDictionaries:[],//宅基地代码
         shyqrdmDictionaries:[],//使用权人
         getObligeeOptions:[],//下拉框列表
+        //计算有偿使用面积
+        jsmjData:{
+          zdmjSum:0.00,
+          hzdmj:0.00,
+        },
         landStatus:"1",
         tcqllx:'',
         tclx:'',
         tcfs:'',
-        zjlx:'',
+        zjlx:'身份证',
         bcfs:'',
         zjddm:'',
         sysFarmer:{deptId:this.$store.state.user.loginDeptId,memberName:""},
@@ -168,7 +182,7 @@
         showycsydqsj: false,
         showDropList: false,//是否显示下拉框
         mapShow: false,
-        circulation:{},
+        circulation:{ ycsymj:0.00, ycsyfy:0.00, ycsymjdj:0.00,sfyhdz:"0"},
         minDate: new Date(),
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(),
@@ -236,9 +250,6 @@
         getByLyZjddm(data).then((response) => {
           this.$set(this.circulation, "sfyhdz", response.data.isMore);
           // const baseImgUrl = this.$store.getters.baseRoutingUrl;
-          if(response.data.zdt != null && response.data.zdt !== ""){
-            this.$set(this.form, "xzzp", response.rows[0].zdt);
-          }
         });
       },
       /** 模糊查询人员信息 */
@@ -336,6 +347,53 @@
           this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
         },1000);
       },
+      /** 有偿使用面积计算 */
+      computeMJ(){
+        if(this.circulation.shyqrdbxm == null || this.circulation.shyqrdbxm === ""){
+          return  this.$toast("请先选择使用权人");
+        }
+        let _this = this;
+        _this.$set( _this.circulation, "ycsymj",  0.00);
+        _this.$set( _this.jsmjData, "hzdmj",  0.00);
+        _this.$set( _this.jsmjData, "zdmjSum",  0.00);
+        listProgramme({}).then((res) => {
+          if(res.rows.length > 0){
+            _this.$set( _this.jsmjData, "hzdmj", res.rows[0].maxArea);
+          }
+          selectHomesteadObligeeMapList({shyqrdbxm:_this.circulation.shyqrdbxm,landStatus:_this.landStatus}).then((response) => {
+            if (response.code == 200) {
+              response.data.map(function(item){
+                _this.$set( _this.jsmjData, "zdmjSum", _this.jsmjData.zdmjSum + item.zjdzdxx.zdmj);
+                if(_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj > 0){
+                  _this.$set( _this.circulation, "ycsymj",  (_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj).toFixed(2));
+                }else{
+                  _this.$set( _this.circulation, "ycsymj", 0.00);
+                }
+
+              });
+            }
+          });
+        })
+
+      },
+      /**使用费用计算 */
+      computeFY(){
+        let _this = this;
+        _this.$set( _this.circulation, "ycsymjdj",  0.00);
+        _this.$set( _this.circulation, "ycsyfy",  0.00);
+        listYcsyjfbz({}).then(response => {
+          response.rows.map(function(item){
+            if(_this.circulation.ycsymj >= item.startArea && _this.circulation.ycsymj <= item.endArea){
+              _this.$set( _this.circulation, "ycsyfy",  (_this.circulation.ycsymj * item.feeAmount).toFixed(2));
+            }
+          });
+        });
+      },
+      changeDJ() {
+        if (this.circulation.ycsymj != null) {
+          this.circulation.ycsyfy = ((this.circulation.ycsymj * this.circulation.ycsymjdj)).toFixed(2);
+        }
+      },
       goSubmit(){
         ycsyAdd(this.circulation).then(response => {
           if(response.code = 200){
diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue
index e6eb6e6a..d395120f 100644
--- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue
+++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue
@@ -25,9 +25,11 @@
           <template #icon>
             <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
           </template>
+          <span>{{item.ycsyfy}}元</span>
           <template #label>
-            <p><b style="color: #539FFD;">{{item.sqrzjhm}}</b><i style="margin-right: 0.5rem;"></i><i >{{item.ycsykssj}} ~ </i><i style="margin-right: 0.5rem;"></i>{{item.ycsydqsj}}</p>
+            <p><b style="color: #539FFD;">{{item.sqrzjhm}}</b><i style="margin-right: 0.5rem;"></i></p>
           </template>
+
         </van-cell>
                   <template #right>
                     <van-row>
diff --git a/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue b/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue
index 48be788d..8fdbd7e0 100644
--- a/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue
+++ b/src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue
@@ -106,10 +106,17 @@
           @confirm="onConfirmYcsydqsj"
         />
       </van-popup>
-
-      <van-field v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto">
+        <template #button>
+          <van-button size="small" @click="computeMJ" type="primary">计算</van-button>
+        </template>
+      </van-field>
+      <van-field v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" @change="changeDJ"  input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right" label-width="auto">
+        <template #button>
+          <van-button size="small" @click="computeFY" type="primary">计算</van-button>
+        </template>
+      </van-field>
       <van-field v-model="circulation.fkfs" label="付款方式" placeholder="请输入付款方式" input-align="right" label-width="auto"/>
       <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
@@ -132,10 +139,12 @@
 </template>
 
 <script>
-  import { zjdzd } from "@/api/onlineHome/homestead/circulation";
+  import { zjdzd,selectHomesteadObligeeMapList } from "@/api/onlineHome/homestead/circulation";
   import { ycsyEdit,getYcsy  } from "@/api/onlineHome/homestead/paidUtilize";
   import {  getShyqrs,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
+  import { listYcsyjfbz} from "@/api/onlineHome/homestead/homeuseycsyjfbz";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
+  import {listProgramme} from "@/api/onlineHome/homestead/programme";
   export default {
     name: "paidUtilizeAdd",
     components: {MapGisObtainTc},
@@ -149,6 +158,11 @@
         zjdDictionaries:[],//宅基地代码
         shyqrdmDictionaries:[],//使用权人
         getObligeeOptions:[],//下拉框列表
+        //计算有偿使用面积
+        jsmjData:{
+          zdmjSum:0.00,
+          hzdmj:0.00,
+        },
         landStatus:"1",
         tcqllx:'',
         tclx:'',
@@ -243,31 +257,51 @@
       },
       /** 查找地图中宅基地 */
       closeMoule: function (data) {
-        this.circulation.zjddm = data;
-        let _this = this;
-        let handlerTime = this.getDate();
-        this.$set(this.circulation, "sqrq", handlerTime);
-        this.$set(this.circulation, "pzrq", handlerTime);
-        this.$set(this.circulation, "barq", handlerTime);
         getByLyZjddm(data).then((response) => {
-          this.$set(this.circulation, "ntcmj", response.data.zdmj);
-          this.$set(this.circulation, "tcmj", response.data.zdmj);
-          this.$set(this.circulation, "zjdszd", response.data.zdszd);
-          this.$set(this.circulation, "zjdszn", response.data.zdszn);
-          this.$set(this.circulation, "zjdszx", response.data.zdszx);
-          this.$set(this.circulation, "zjdszb", response.data.zdszb);
-          this.$set(this.circulation, "theGeomJson", response.data.theGeomJson);
-          this.$set(this.circulation, "tcqszsh", response.data.zsh);
-          listHomesteadnmfw({zjddm: data}).then((res) => {
-            res.rows.map(function(item){
-              _this.$set(_this.circulation, "jzmj", Number(_this.circulation.jzmj) + Number(item.jzmj));
-              _this.$set(_this.circulation, "xjzmj", Number(_this.circulation.xjzmj) + Number(item.jzmj));
-            });
-          });
+          this.$set(this.circulation, "sfyhdz", response.data.isMore);
           // const baseImgUrl = this.$store.getters.baseRoutingUrl;
-          if(response.data.zdt != null && response.data.zdt !== ""){
-            this.$set(this.form, "xzzp", response.rows[0].zdt);
+        });
+      },
+      /** 有偿使用面积计算 */
+      computeMJ(){
+        if(this.circulation.shyqrdbxm == null || this.circulation.shyqrdbxm === ""){
+          return  this.$toast("请先选择使用权人");
+        }
+        let _this = this;
+        _this.$set( _this.circulation, "ycsymj",  0.00);
+        _this.$set( _this.jsmjData, "hzdmj",  0.00);
+        _this.$set( _this.jsmjData, "zdmjSum",  0.00);
+        listProgramme({}).then((res) => {
+          if(res.rows.length > 0){
+            _this.$set( _this.jsmjData, "hzdmj", res.rows[0].maxArea);
           }
+          selectHomesteadObligeeMapList({shyqrdbxm:_this.circulation.shyqrdbxm,landStatus:_this.landStatus}).then((response) => {
+            if (response.code == 200) {
+              response.data.map(function(item){
+                _this.$set( _this.jsmjData, "zdmjSum", _this.jsmjData.zdmjSum + item.zjdzdxx.zdmj);
+                if(_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj > 0){
+                  _this.$set( _this.circulation, "ycsymj",  (_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj).toFixed(2));
+                }else{
+                  _this.$set( _this.circulation, "ycsymj", 0.00);
+                }
+
+              });
+            }
+          });
+        })
+
+      },
+      /**使用费用计算 */
+      computeFY(){
+        let _this = this;
+        _this.$set( _this.circulation, "ycsymjdj",  0.00);
+        _this.$set( _this.circulation, "ycsyfy",  0.00);
+        listYcsyjfbz({}).then(response => {
+          response.rows.map(function(item){
+            if(_this.circulation.ycsymj >= item.startArea && _this.circulation.ycsymj <= item.endArea){
+              _this.$set( _this.circulation, "ycsyfy",  (_this.circulation.ycsymj * item.feeAmount).toFixed(2));
+            }
+          });
         });
       },
       /** 模糊查询人员信息 */
@@ -365,6 +399,11 @@
           this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
         },1000);
       },
+      changeDJ() {
+        if (this.circulation.ycsymj != null) {
+          this.circulation.ycsyfy = ((this.circulation.ycsymj * this.circulation.ycsymjdj)).toFixed(2);
+        }
+      },
       goSubmit(){
         ycsyEdit(this.circulation).then(response => {
           if(response.code = 200){

From 8c1d9a3580517841bf5dcb48b95b22535a94da6b Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Wed, 29 Mar 2023 16:17:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=86=9C=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |  27 +
 src/router/index.js                           |  26 +-
 .../sunVillage_info/index_code_rights.vue     |   1 +
 .../sunVillage_info/list_multipleLots.vue     |   6 +-
 .../sunVillage_info/list_multipleLotsNh.vue   | 526 ++++++++++++++++++
 .../list_multipleLotsNh_detail.vue            | 190 +++++++
 ...s_add.vue => list_multipleLots_detail.vue} |  14 +-
 src/views/sunVillage_info/login.vue           |   5 -
 src/views/sunVillage_info/login_code.vue      |   2 +-
 9 files changed, 774 insertions(+), 23 deletions(-)
 create mode 100644 src/views/sunVillage_info/list_multipleLotsNh.vue
 create mode 100644 src/views/sunVillage_info/list_multipleLotsNh_detail.vue
 rename src/views/sunVillage_info/{list_multipleLots_add.vue => list_multipleLots_detail.vue} (95%)

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index ee62369c..9f2e84da 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -709,3 +709,30 @@ export function multipleLotsFirstSign(data, id) {
     data: data
   })
 }
+
+// 查询标段农户信息
+export function listMultipleLotsNh(query) {
+  return request({
+    url: '/home/mobile/multipleLotsNh/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询标段农户详情
+export function getMultiplelotsNh(query, id) {
+  return request({
+    url: '/home/mobile/multipleLotsNh/get/' + id,
+    method: 'get',
+    params: query
+  })
+}
+
+// 标段合同乙方签字
+export function multipleLotsSecondSign(data, id) {
+  return request({
+    url: '/transaction/multiplelotsnh/secondSign/' + id,
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index a2d4183f..f57b79c6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3830,14 +3830,32 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_multipleLots'], resolve)
   },
-  { ////阳光村务（新）-- 标段合同网签
-    path: '/sunVillage_info/list_multipleLots_add',
-    name: 'sunVillageInfoListMultipleLotsAdd',
+  { ////阳光村务（新）-- 标段合同详情
+    path: '/sunVillage_info/list_multipleLots_detail',
+    name: 'sunVillageInfoListMultipleLotsDetail',
+    meta: {
+      title: '标段合同详情',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_multipleLots_detail'], resolve)
+  },
+  { ////阳光村务（新）-- 标段农户网签
+    path: '/sunVillage_info/list_multipleLotsNh',
+    name: 'sunVillageInfoListMultipleLotsNh',
     meta: {
       title: '标段合同网签',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/sunVillage_info/list_multipleLots_add'], resolve)
+    component: (resolve) => require(['@/views/sunVillage_info/list_multipleLotsNh'], resolve)
+  },
+  { ////阳光村务（新）-- 标段农户详情
+    path: '/sunVillage_info/list_multipleLotsNh_detail',
+    name: 'sunVillageInfoListMultipleLotsNhDetail',
+    meta: {
+      title: '标段合同详情',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_multipleLotsNh_detail'], resolve)
   },
   { ////阳光村务（新）-- 宅基地申请
     path: '/sunVillage_info/homeApplication/applicationList',
diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue
index 5d6633e0..f4f7c099 100644
--- a/src/views/sunVillage_info/index_code_rights.vue
+++ b/src/views/sunVillage_info/index_code_rights.vue
@@ -222,6 +222,7 @@
               justify-content: center;
               padding-top: 40PX;
               width: 25%;
+              margin-top: 10PX;
               &:nth-child(3){
                 margin-right: 0;
               }
diff --git a/src/views/sunVillage_info/list_multipleLots.vue b/src/views/sunVillage_info/list_multipleLots.vue
index ebe3fc97..7e864d36 100644
--- a/src/views/sunVillage_info/list_multipleLots.vue
+++ b/src/views/sunVillage_info/list_multipleLots.vue
@@ -132,7 +132,9 @@
       },
       getList() {
         listMultiplelots(this.queryParams).then(response => {
-          this.applicationList = response.rows;
+          response.rows.forEach(item => {
+            this.applicationList.push(item);
+          });
 
           if (this.applicationList.length >= response.total) {
             this.finished = true;
@@ -145,7 +147,7 @@
       },
       goDetail(id) {
         this.$router.push({
-          path: '/sunVillage_info/list_multipleLots_add',
+          path: '/sunVillage_info/list_multipleLots_detail',
           query: { id: id }
         })
       },
diff --git a/src/views/sunVillage_info/list_multipleLotsNh.vue b/src/views/sunVillage_info/list_multipleLotsNh.vue
new file mode 100644
index 00000000..c8091773
--- /dev/null
+++ b/src/views/sunVillage_info/list_multipleLotsNh.vue
@@ -0,0 +1,526 @@
+<template>
+  <div class="home_wrapper">
+    <div
+      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>
+
+    <div class="list_main">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList"
+      >
+        <!----1-->
+        <van-swipe-cell v-for="(item,index) in applicationList" :key="index" :disabled="item.secondIsSign === '是'" >
+          <div class="item" @click="goDetail(item.id)">
+            <div class="info">
+              <div class="title">
+                <i class="icon_box" v-if="item.secondSigning==null"></i>
+                <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>
+              </div>
+              <div class="time">
+                <p>{{item.contractName}}</p>
+                <p style="color:#eb1616;font-weight: bold;"><span style="font-size: 12px;">￥</span>{{item.logAmount.toFixed(2)}}</p>
+              </div>
+            </div>
+          </div>
+          <template #right>
+            <div class="operation">
+              <!-- delete 删除 edit编辑 view查看 list榜单 -->
+              <div class="opera_btn" @click="openPopup(item.id)" v-if="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 == '是' ">
+                <img src="../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
+                <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>
+      </van-list>
+    </div>
+    <van-popup v-model="show" closeable position="right" :style="{ height: '100%' }" >
+      <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+          />
+        </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT" style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <div class="signature-footer">
+          <van-button @click="handleGenerate" type="info" size="small">保存签字</van-button>
+          <van-button @click="handleReset" class="clearBtn" type="info" plain  size="small">清空画板</van-button>
+        </div>
+      </van-cell-group>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+  import { listMultipleLotsNh, multipleLotsSecondSign } from "@/api/sunVillage_info/fixedAssets";
+  import vueEsign from "vue-esign";
+  import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
+  import $ from "jquery";
+  import Cookies from "js-cookie";
+
+  export default {
+    name: "sunVillageInfoListMultipleLotsNh",
+    components: {vueEsign, signatureUploadSignature},
+    data() {
+      return {
+        applicationList: [],
+        loading: false,
+        finished: false,
+        show: false,
+        showFile: false,
+        fileList: [],
+        listLength: '0',
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          idcard: null,
+          translate_dict: 1,
+        },
+        showBtn: true,
+
+        signatureImg: '',
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
+        signaId: '',
+        height: null
+      };
+    },
+    created() {
+      this.height = window.screen.height * 1.28 - 20;
+      this.queryParams.idcard = JSON.parse(Cookies.get('user')).idcard;
+    },
+    methods: {
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      getList() {
+        listMultipleLotsNh(this.queryParams).then(response => {
+          response.rows.forEach(item => {
+            this.applicationList.push(item);
+          });
+          if (this.applicationList.length >= response.total) {
+            this.finished = true;
+            return;
+          } else {
+            this.loading = false;
+            this.queryParams.pageNum += 1;
+          }
+        });
+      },
+      goDetail(id) {
+        this.$router.push({
+          path: '/sunVillage_info/list_multipleLotsNh_detail',
+          query: { id: id }
+        })
+      },
+      openPopup(id, url) {
+        this.show = true;
+        this.signaId = id;
+      },
+      openPopupFile(file) {
+        this.showFile = true;
+        if (!file) return;
+        let fileArray = file.split(',');
+        fileArray.map(res => {
+          this.fileList.push({
+            url: '/api' + res,
+            isImage: true
+          })
+        })
+      },
+      signaImgFun(url) {
+        this.signatureImg = url;
+      },
+      // 清空画板
+      handleReset() {
+        this.$refs.esign.reset();
+        $('#canvasTT').css('display', 'block')
+      },
+      // 生成签字图
+      handleGenerate() {
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData()  // 创建form对象
+            param.append('file', wj)  // 通过append向form对象添加数据
+            param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
+
+            multipleLotsSecondSign(param, this.signaId).then(response => {
+              this.$notify({type: 'success', message: '签字成功'});
+              this.show = false;
+              location.reload();
+            });
+
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob(dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .home_wrapper {
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+
+      .add_btn {
+        width: 56.4px;
+        height: 40.8px;
+        background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+        background-size: 47px 34px;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
+
+    .record_main {
+      padding: 30px 22px;
+
+      .record_det {
+        height: 38px;
+        line-height: 38px;
+        display: flex;
+        justify-content: space-between;
+
+        .year_l {
+          font-size: 30px;
+          display: flex;
+          align-items: center;
+          color: #858585;
+
+          .unit {
+            padding-left: 5px;
+          }
+
+          .icon {
+            width: 23px;
+            height: 12px;
+            display: block;
+            background: url('../../assets/images/sunVillage_info/list_icon_1.png') no-repeat;
+            background-size: 100% 100%;
+            margin-bottom: 4px;
+            margin-right: 8px;
+
+            &.zk {
+              transform: rotate(0deg)
+            }
+
+            &.ss {
+              transform: rotate(180deg)
+            }
+
+          }
+        }
+
+        .total_r {
+          font-size: 26px;
+          letter-spacing: 2px;
+        }
+      }
+
+      .record_list {
+        display: flex;
+        flex-flow: wrap;
+        margin-top: 12PX;
+
+        .flex_block {
+          font-size: 30px;
+          color: #878787;
+          padding-right: 30px;
+
+          &.current {
+            color: #4199fe;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+
+    .list_main {
+      padding: 0 22px;
+      margin-top: 15PX;
+
+      .item {
+        border-radius: 30px;
+        background: #fff;
+        box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+        padding: 25px 32px;
+        margin-bottom: 20px;
+
+        .info {
+          .title {
+            display: flex;
+            font-size: 32px;
+            align-items: center;
+            height: 58px;
+
+            .icon_box {
+              width: 34px;
+              display: block;
+              height: 30px;
+              background: url('../../assets/images/sunVillage_info/signature_icon_01.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+              flex-shrink: 0;
+            }
+
+            .icon_box1 {
+              width: 34px;
+              display: block;
+              height: 30px;
+              background: url('../../assets/images/sunVillage_info/signature_icon_01g.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+              flex-shrink: 0;
+            }
+
+            .news_title {
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 1;
+              word-break: break-all;
+              overflow: hidden;
+            }
+
+            .tips_mark {
+              background: #ffedcd;
+              border-radius: 8px;
+              font-size: 24px;
+              color: #f8a83d;
+              text-align: center;
+              line-height: 34px;
+              flex-shrink: 0;
+              padding: 0 5Px;
+              margin-left: auto;
+            }
+
+            .tips_mark2 {
+              background: #eb1616;
+              border-radius: 8px;
+              font-size: 24px;
+              color: #ffffff;
+              text-align: center;
+              line-height: 34px;
+              flex-shrink: 0;
+              padding: 0 5Px;
+              margin-left: 10PX;
+            }
+          }
+
+          .time {
+            font-size: 16PX;
+            color: #333333;
+            display: flex;
+            align-items: center;
+            margin-top: 5PX;
+            justify-content: space-between;
+
+            .icon_time {
+              width: 25px;
+              height: 25px;
+              background: url('../../assets/images/sunVillage_info/list_icon_4.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+            }
+          }
+        }
+      }
+
+      .operation {
+        display: flex;
+        align-items: center;
+        justify-content: right;
+        text-align: center;
+        border-radius: 30px;
+        background: #fff;
+        box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+        height: 100%;
+        padding: 0 15Px;
+        margin-left: 10PX;
+
+        .opera_btn {
+          border-radius: 50%;
+
+          &.delete {
+            background: #df0707;
+            margin-left: 10PX;
+
+            .icon {
+              width: 22PX;
+              height: 29PX;
+              background: url('../../assets/images/sunVillage_info/signature_icon_03.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+
+          &.edit {
+            background: #79cf13;
+            margin-left: 10PX;
+
+            .icon {
+              width: 26PX;
+              height: 25PX;
+              background: url('../../assets/images/sunVillage_info/signature_icon_02.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+
+          &.view {
+            background: #3494ff;
+            margin-left: 10PX;
+
+            .icon {
+              width: 29PX;
+              height: 21PX;
+              background: url('../../assets/images/sunVillage_info/signature_icon_04.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+
+          &.list {
+            background: #79cf13;
+            margin-left: 10PX;
+
+            .icon {
+              width: 29px;
+              height: 21px;
+              background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
+              background-size: 100% 100%;
+              display: block;
+            }
+          }
+        }
+      }
+    }
+
+    .bottom_tips {
+      font-size: 24px;
+      color: #a7a6a6;
+      text-align: center;
+      margin-top: 32px;
+      background: url('../../assets/images/sunVillage_info/list_icon_8.png') center center no-repeat;
+      background-size: 260px 2px;
+
+      .xs {
+        padding: 0 8px;
+        background: #e9e9e9;
+      }
+    }
+
+    .signature-box {
+      border: 1px dashed #666;
+      margin: 2px 20px;
+      height: 100%;
+      /*canvas{*/
+      /*  height: 100%!important;*/
+      /*}*/
+    }
+
+    .signature-footer {
+      transform: rotate(90deg);
+      width: auto;
+      position: absolute;
+      top: 50%;
+      left: 0PX;
+
+      .clearBtn {
+        margin-left: 15px;
+      }
+    }
+
+    .esigh-result {
+      margin: 15px 20px;
+      // height: 110px;
+      border: 1px solid #666;
+      font-size: 0;
+
+      .imgs {
+        width: 100%;
+      }
+    }
+  }
+</style>
diff --git a/src/views/sunVillage_info/list_multipleLotsNh_detail.vue b/src/views/sunVillage_info/list_multipleLotsNh_detail.vue
new file mode 100644
index 00000000..b897d135
--- /dev/null
+++ b/src/views/sunVillage_info/list_multipleLotsNh_detail.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      标段农户详情
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="list_main">
+      <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.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"/>
+      <van-field v-model="form.phone" label="联系电话" placeholder="联系电话" input-align="right" :border="false"/>
+      <van-field v-model="form.lotArea" label="标段数量" placeholder="标段数量" input-align="right" :border="false"/>
+      <van-field v-model="form.lotUnit" label="数量单位" placeholder="数量单位" input-align="right" :border="false"/>
+      <van-field v-model="form.logAmount" label="金额(元)" placeholder="金额(元)" input-align="right" :border="false"/>
+      <van-field v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false"/>
+
+      <van-divider>乙方信息</van-divider>
+      <van-field v-model="form.secondIsSign" label="乙方已签" placeholder="乙方已签" input-align="right" :border="false"/>
+      <van-field v-model="form.secondPartyAt" label="乙方签字日期" placeholder="乙方签字日期" input-align="right" :border="false"/>
+      <van-field label="乙方签字" input-align="right" :border="false" />
+      <img :src="'/api'+form.secondSigning" width="100%" alt="" v-if="form.secondSigning" />
+    </div>
+  </div>
+</template>
+
+<script>
+  import {getMultiplelotsNh} from "@/api/sunVillage_info/fixedAssets";
+
+  export default {
+    name: "listMultipleLotsNhDetail",
+    data() {
+      return {
+        form: {},
+      };
+    },
+    created() {
+      this.getDetail();
+    },
+    methods: {
+      getDetail() {
+        let query = {
+          translate_dict: 1
+        };
+        getMultiplelotsNh(query, this.$route.query.id).then((res) => {
+          if (res.code === 200) {
+            this.form = res.data;
+          }
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  /deep/ .van-button--primary {
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
+
+  .home_wrapper {
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+    }
+
+    .release_head {
+      height: 90px;
+      padding: 0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+
+      .people {
+        flex: 1;
+        display: flex;
+        align-items: center;
+
+        .icon {
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+
+      .time {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .icon {
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+
+    .release_conetnt {
+      padding: 0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+
+      img {
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+
+      p {
+        margin-bottom: 16px;
+      }
+    }
+
+    .list_main {
+      padding: 25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+
+    .titBox {
+      display: flex;
+      align-items: center;
+    }
+
+    .tit {
+      font-size: 36px;
+      font-weight: bold;
+    }
+
+    /deep/ .van-cell {
+      padding-left: 0 !important;
+      padding-right: 0 !important;
+      padding-bottom: 0 !important;
+    }
+
+    /deep/ .van-field__label {
+      /*padding-left: 10PX;*/
+      width: auto;
+      display: flex;
+      align-items: center;
+    }
+
+    /deep/ .van-cell--required::before {
+      left: 85PX;
+    }
+
+    /deep/ .van-field__error-message {
+      display: none;
+    }
+  }
+</style>
diff --git a/src/views/sunVillage_info/list_multipleLots_add.vue b/src/views/sunVillage_info/list_multipleLots_detail.vue
similarity index 95%
rename from src/views/sunVillage_info/list_multipleLots_add.vue
rename to src/views/sunVillage_info/list_multipleLots_detail.vue
index 7027a223..43205031 100644
--- a/src/views/sunVillage_info/list_multipleLots_add.vue
+++ b/src/views/sunVillage_info/list_multipleLots_detail.vue
@@ -22,32 +22,24 @@
       <van-field v-model="form.firstIsSign" label="甲方已签" placeholder="甲方已签" input-align="right" :border="false"/>
       <van-field v-model="form.firstPartyAt" label="甲方签字日期" placeholder="甲方签字日期" input-align="right" :border="false"/>
       <van-field label="甲方签字" input-align="right" :border="false" />
-      <img :src="'/api'+form.firstSigning" width="100%" alt="" v-if="form.firstSigning">
+      <img :src="'/api'+form.firstSigning" width="100%" alt="" v-if="form.firstSigning" />
       <van-field label="村级公章" input-align="right" :border="false" />
-      <img :src="'/api'+form.firstSeal" width="100%" alt="" v-if="form.firstSeal">
-
+      <img :src="'/api'+form.firstSeal" width="100%" alt="" v-if="form.firstSeal" />
     </div>
   </div>
 </template>
 
 <script>
   import {getMultiplelots} from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
 
   export default {
-    name: "certificateList",
+    name: "listMultipleLotsDetail",
     data() {
       return {
         form: {},
-        queryParams: {
-          bookId: '',
-          deptId: ''
-        },
       };
     },
     created() {
-      this.queryParams.bookId = Cookies.get('bookId');
-      this.queryParams.deptId = Cookies.get('deptId');
       this.getDetail();
     },
     methods: {
diff --git a/src/views/sunVillage_info/login.vue b/src/views/sunVillage_info/login.vue
index 82f0d4a0..9f57f627 100644
--- a/src/views/sunVillage_info/login.vue
+++ b/src/views/sunVillage_info/login.vue
@@ -146,11 +146,6 @@
         }
       },
       handleLogin(values) {
-        console.log(this.formData.username)
-        console.log(this.formData.password)
-        console.log(this.formData.code)
-
-
           if (this.formData.rememberMe) {
             Cookies.set("username", this.formData.username, { expires: 30 });
             Cookies.set("password", encrypt(this.formData.password), { expires: 30 });
diff --git a/src/views/sunVillage_info/login_code.vue b/src/views/sunVillage_info/login_code.vue
index 4de825de..c32eddb7 100644
--- a/src/views/sunVillage_info/login_code.vue
+++ b/src/views/sunVillage_info/login_code.vue
@@ -120,7 +120,7 @@
             return false;
           }
           checkFarmer(this.formData).then(response => {
-            console.log(response.data)
+            // console.log(response.data)
             if (response.code == 200){
               Cookies.set("user", response.data, { expires: 30 });
               this.$router.push({path:'/sunVillage_info/index_code_rights'})