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

src/api/homesteadSurvey/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查任务列表
 export function listTask(query) {
   return request({
-    url: '/houseSurvey/task/list',
+    url: '/home/homesteadsurvey/list',
     method: 'get',
     params: query
   })
@@ -79,7 +79,7 @@ export function sysConfig(query) {
 // 查询数据调查任务列表
 export function userList() {
   return request({
-    url: '/houseSurvey/task/userList',
+    url: '/home/homesteadsurvey/userList',
     method: 'get'
   })
 }

src/api/onlineHome/homestead/circulation.js

@@ -28,7 +28,7 @@ export function getLz(id){
 //宅基地代码
 export function zjdzd(){
   return request({
-    url:'/house/mobile/zjdzd/list',
+    url:'/home/homesteadzjdzdxx/list',
     method:'get'
   })
 }

src/api/onlineHome/homestead/paidUtilize.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 //查询列表
 export function getList(data){
   return request({
-    url:'/house/mobile/ycsy/list',
+    url:'/home/ycsy/list',
     method:'get',
     params:data
   })
@@ -12,7 +12,7 @@ export function getList(data){
 //删除列表项
 export function removeList(id){
   return request({
-    url:'/house/ycsy/remove/'+id,
+    url:'/home/ycsy/remove/'+id,
     method:'get'
   })
 }
@@ -20,23 +20,16 @@ export function removeList(id){
 //详情
 export function getYcsy(id){
   return request({
-    url:'/house/ycsy/get/'+id,
+    url:'/home/ycsy/get/'+id,
     method:'get'
   })
 }
 
-//提交
-export function submitApply(id){
-  return request({
-    url:'/house/ycsy/submitApply/'+id,
-    method:'post'
-  })
-}
 
 //修改
 export function ycsyEdit(data){
   return request({
-    url:'/house/ycsy/edit',
+    url:'/home/ycsy/edit',
     method:'post',
     data:data
   })
@@ -45,12 +38,13 @@ export function ycsyEdit(data){
 //新增
 export function ycsyAdd(data){
   return request({
-    url:'/house/ycsy/add',
+    url:'/home/ycsy/add',
     method:'post',
     data:data
   })
 }
 
+
 //使用权人查询
 export function listByDeptId(){
   return request({

src/router/index.js

@@ -1027,10 +1027,10 @@ export const constantRoutes = [
     path: '/paidUtilizeList',
     name: 'paidUtilizeList',
     meta: {
-      title: '有偿利用',
+      title: '有偿使用',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeList'], resolve)
+    component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeList'], resolve)
   },
   {
     path: '/paidUtilizeModify',
@@ -1039,7 +1039,7 @@ export const constantRoutes = [
       title: '修改有偿利用',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeModify'], resolve)
+    component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeModify'], resolve)
   },
   {
     path: '/paidUtilizeDteail',
@@ -1048,7 +1048,7 @@ export const constantRoutes = [
       title: '查看有偿利用',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail'], resolve)
+    component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeDteail'], resolve)
   },
   {
     path: '/paidUtilizeAdd',
@@ -1057,7 +1057,7 @@ export const constantRoutes = [
       title: '添加有偿利用',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd'], resolve)
+    component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeAdd'], resolve)
   },
   {
     path: '/zzjyList',

src/views/homesteadSurvey/index.vue

@@ -56,7 +56,6 @@
     <div style="margin:20px;">
       <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;">任务列表</p>
     </div>
-
     <div v-if="active==1" style="height:calc( 100vh - 350px);overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask" :immediate-check="false">
       <van-cell  v-for="(item,index) in totalList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
@@ -80,8 +79,8 @@
           />
         </template>
         <template #label>
-          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.planBeginTime}}~{{item.planEndTime}}</p>
-          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{taskExecutorChange(item)}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.jhkssj}}~{{item.jhjssj}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{item.rwzxr}}</p>
         </template>
       </van-cell>
       </van-pull-refresh>
@@ -109,8 +108,8 @@
           />
         </template>
         <template #label>
-          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.planBeginTime}}~{{item.planEndTime}}</p>
-          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{taskExecutorChange(item)}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.jhkssj}}~{{item.jhjssj}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{item.rwzxr}}</p>
         </template>
       </van-cell>
       </van-pull-refresh>
@@ -138,8 +137,8 @@
           />
         </template>
         <template #label>
-          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.planBeginTime}}~{{item.planEndTime}}</p>
-          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{taskExecutorChange(item)}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.jhkssj}}~{{item.jhjssj}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{item.rwzxr}}</p>
         </template>
       </van-cell>
       </van-pull-refresh>
@@ -185,8 +184,8 @@
           },
           // 查询参数
           queryParams: {
-            taskStatus: null,
-            taskPublishStatus:"PUBLISHED",
+            rwwczt: null,
+            rwfbzt:"PUBLISHED",
             taskExecutor:null
           },
           nickName:"",
@@ -297,8 +296,8 @@
           let _this = this
           if(this.active==1){
             let params = {
-              "taskStatus": "FINISHED",
-              "taskPublishStatus":"PUBLISHED",
+              "rwwczt": "FINISHED",
+              "rwfbzt":"PUBLISHED",
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
@@ -312,8 +311,8 @@
             });
           }else if(this.active==2){
             let params = {
-              "taskStatus": "UNFINISHED",
-              "taskPublishStatus":"PUBLISHED",
+              "rwwczt": "UNFINISHED",
+              "rwfbzt":"PUBLISHED",
               "pageNum": this.countwhc+1,
               "pageSize":10,
             }
@@ -327,7 +326,7 @@
             });
           }else{
             let params = {
-              "taskPublishStatus":"PUBLISHED",
+              "rwfbzt":"PUBLISHED",
               "pageNum": this.countqb+1,
               "pageSize":10,
             }

src/views/onlineHome/homestead/paidUtilize/paidUtilizeAdd.vue

@@ -151,7 +151,7 @@
 
 <script>
   import { zjdzd } from "@/api/onlineHome/homestead/circulation";
-  import { ycsyAdd , listByDeptId } from "@/api/onlineHome/homestead/paidUtilize";
+  import { ycsyAdd  } from "@/api/onlineHome/homestead/paidUtilize";
   import {Notify} from "vant";
   export default {
     name: "paidUtilizeAdd",
@@ -226,12 +226,12 @@
               this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
             }
           });
-          //使用权人代码
-          listByDeptId().then(zjdRes => {
-            for (let i = 0; i < zjdRes.rows.length; i++) {
-              this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
-            }
-          });
+          // //使用权人代码
+          // listByDeptId().then(zjdRes => {
+          //   for (let i = 0; i < zjdRes.rows.length; i++) {
+          //     this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
+          //   }
+          // });
       },
       onConfirmZjddm(data){
         console.log(data)

src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue

@@ -57,7 +57,7 @@
         label-width="auto"
       />
       <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisLyDrawing ref="zjdProductResh" :message="circulation.zjddm"></MapGisLyDrawing>
+        <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm"></MapGisObtainTc>
       </van-dialog>
       <van-field readonly v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto"/>
       <van-field readonly v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" input-align="right" label-width="auto"/>
@@ -71,11 +71,11 @@
 <script>
   import { zjdzd } from "@/api/onlineHome/homestead/circulation";
   import { zyyctcEdit , getYcsy , ycsyEdit } from "@/api/onlineHome/homestead/paidUtilize";
-  import MapGisLyDrawing from "@/components/Map/MapGisLyDrawing";
+  import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import $ from "jquery";
   export default {
     name: "paidUtilizeDteail",
-    components: { MapGisLyDrawing,},
+    components: {MapGisObtainTc},
     data() {
       return {
         tcqllxDictionaries:[],//退出权利类型

src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue

@@ -21,12 +21,199 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.zjddm" center :to="{name:'paidUtilizeDteail', query: {id:item.id}}" >
+          <van-cell :title="item.shyqrdbxm" center :to="{name:'paidUtilizeDteail', query: {id:item.id}}" >
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p>{{item.shyqrxm}}{{item.shyqrdm}}</p>
+              <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>
+            </template>
+          </van-cell>
+          <template #right>
+            <van-row>
+              <van-col>
+                <van-button square text="修改"   :to="{name:'paidUtilizeModify', query: {id:item.id}}" type="info" class="delete-button" />
+              </van-col>
+              <van-col>
+                <van-button square text="删除"  @click="deleteList(item.id,index)" type="danger" class="delete-button" />
+              </van-col>
+            </van-row>
+          </template>
+        </van-swipe-cell>
+      </van-list>
+    </div>
+</template>
+
+<script>
+import { getList , removeList  } from "@/api/onlineHome/homestead/paidUtilize";
+import {getGeoServerConfigKey} from "@/api/system/config";
+export default {
+  name: "paidUtilizeList",
+  data() {
+    return {
+      applicationList:[],
+      houseApplyStatus:[],
+      tcqllxStatus:[],
+      tclxStatus:[],
+      tcfsStatus:[],
+      auditStatus:[],
+      loading: false,
+      finished: false,
+      queryParams:{
+        pageNum:1,
+        pageSize:10,
+        orderByColumn:'id',
+        isAsc:'desc'
+      },
+      //地图服务地址
+      mapGeoServerUrl:"",
+    };
+  },
+  created() {
+    this.houseGetDicts("tcqllx").then((res) => {
+      this.tcqllxStatus = res.data;
+    });
+    this.houseGetDicts("tclx").then((res) => {
+      this.tclxStatus = res.data;
+    });
+    this.houseGetDicts("tcfs").then((res) => {
+      this.tcfsStatus = res.data;
+    });
+    this.houseGetDicts("audit_status").then((res) => {
+      this.auditStatus = res.data;
+    });
+  },
+  methods: {
+    goAdd(){
+      window.location = 'paidUtilizeAdd';
+    },
+    getList(){
+      setTimeout(() => {
+        getList(this.queryParams).then(response => {
+          console.log(response)
+          // for (var i = 0; i < response.rows.length; i++) {
+          //   response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
+          //   response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
+          //   response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
+          //   response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
+          //   this.applicationList.push(response.rows[i]);
+          // }
+          this.applicationList = response.rows;
+          if(this.applicationList.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
+        });
+      }, 1000);
+    },
+    deleteList(id,index){
+      this.$dialog.confirm({
+        message: '您确认删除申请草稿？',
+      })
+      .then(() => {
+        // on confirm
+        this.applicationList.splice(index,1)
+        removeList(id).then(res => {
+          if(res.code = 200){
+            this.$toast.success('删除成功');
+          }
+        });
+      })
+      .catch(() => {
+        // on cancel
+      });
+    },
+    goSubmit(id,index){
+      this.$dialog.confirm({
+        message: '您确认提交草稿？',
+      })
+      .then(() => {
+        // on confirm
+        submitApply(id).then(res => {
+          if(res.code = 200){
+            this.$toast.success('提交成功！');
+            setTimeout(function(){
+              history.go(0)
+            },2000)
+          }
+        });
+      })
+      .catch(() => {
+        // on cancel
+      });
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 0.2rem 3%;
+  }
+  /deep/.van-cell__title{
+    flex: 0.7;
+  }
+  /deep/.van-cell__title span{
+    font-family: Arial;
+    font-size: 0.4rem;
+    font-weight: normal;
+  }
+  /deep/.van-cell__value{
+    flex: 0.3;
+    color: #1D6FE9;
+    font-weight: bold;
+  }
+  /deep/.van-swipe-cell{
+    margin-bottom: 0.2rem;
+    border-radius: 0.2rem;
+    overflow: hidden;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+  }
+  /deep/van-ellipsis{
+    font-weight: bold;
+  }
+  .delete-button {
+    height: 100%;
+  }
+  .van-row{
+    height: 100%;
+  }
+  .van-col{
+    height: 100%;
+  }
+</style>
+<template>
+    <div class="app-container">
+      <van-nav-bar
+        left-arrow
+        fixed
+        placeholder
+        @click-left="$router.back(-1)"
+        @click-right="goAdd"
+      >
+        <template #title>
+          <p style="font-weight: bold;">有偿使用</p>
+        </template>
+<!--        <template #right>-->
+<!--          <van-icon name="add" size="18" />-->
+<!--        </template>-->
+      </van-nav-bar>
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList"
+      >
+        <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
+          <van-cell :title="item.shyqrdbxm" center :to="{name:'paidUtilizeDteail', query: {id:item.id}}" >
+            <template #icon>
+              <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
+            </template>
+            <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>
             </template>
           </van-cell>
 <!--          <template #right>-->
@@ -48,7 +235,7 @@
 </template>
 
 <script>
-import { getList , removeList , submitApply } from "@/api/onlineHome/homestead/paidUtilize";
+import { getList , removeList  } from "@/api/onlineHome/homestead/paidUtilize";
 import {getGeoServerConfigKey} from "@/api/system/config";
 export default {
   name: "paidUtilizeList",
@@ -94,14 +281,14 @@ export default {
       setTimeout(() => {
         getList(this.queryParams).then(response => {
           console.log(response)
-          for (var i = 0; i < response.rows.length; i++) {
-            response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
-            response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
-            response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
-            response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
-            this.applicationList.push(response.rows[i]);
-            console.log(this.applicationList);
-          }
+          // for (var i = 0; i < response.rows.length; i++) {
+          //   response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
+          //   response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
+          //   response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
+          //   response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
+          //   this.applicationList.push(response.rows[i]);
+          // }
+          this.applicationList = response.rows;
           if(this.applicationList.length >= response.total){
             this.finished = true;
             return;

src/views/onlineHome/homestead/paidUtilize/paidUtilizeModify.vue

@@ -151,7 +151,7 @@
 
 <script>
   import { zjdzd } from "@/api/onlineHome/homestead/circulation";
-  import { listByDeptId , getYcsy , ycsyEdit } from "@/api/onlineHome/homestead/paidUtilize";
+  import { getYcsy , ycsyEdit } from "@/api/onlineHome/homestead/paidUtilize";
   import {Notify} from "vant";
   export default {
     name: "paidUtilizeModify",
@@ -232,12 +232,12 @@
               this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
             }
           });
-          //使用权人代码
-          listByDeptId().then(zjdRes => {
-            for (let i = 0; i < zjdRes.rows.length; i++) {
-              this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
-            }
-          });
+          // //使用权人代码
+          // listByDeptId().then(zjdRes => {
+          //   for (let i = 0; i < zjdRes.rows.length; i++) {
+          //     this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
+          //   }
+          // });
           this.circulation = response.data;
         });
       },

src/views/sunVillage_info/paidExit/paidExitAdd.vue

@@ -183,13 +183,39 @@
             @cancel="showtcfs = false"
           />
         </van-popup>
-
         <van-field v-model="circulation.tcqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
       </div>
         <p class="main_title">现居住情况</p>
         <van-field v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
         <van-field v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
         <van-field v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+        <p class="main_title">补偿信息</p>
+        <van-field v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+        <van-field v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+        <field-select
+          v-model="circulation.yctcfs"
+          label="退出类型"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择退出类型"
+          remote-url="/system/dict/data/type/yctcfs"
+          :on-remote-response="'data'"
+        />
+        <field-select
+          v-model="circulation.bcfs"
+          label="补偿方式"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择退出类型"
+          remote-url="/system/dict/data/type/bcfs"
+          :on-remote-response="'data'"
+        />
+        <field-date-picker
+          v-model="circulation.bcsj"
+          label="补偿时间"
+          placeholder="选择日期"
+          formatter="yyyy-MM-dd"
+        />
         <p class="main_title">其他</p>
 
         <van-field v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>
@@ -282,6 +308,7 @@ export default {
       tcqllxDictionaries:[],//退出权利类型
       tclxDictionaries:[],//退出类型
       tcfsDictionaries:[],//退出方式
+      yctcfsDictionaries:[],//有偿退出方式
       xbDictionaries:[],//申请人证件类型
       bcfsDictionaries:[],//补偿方式
       zjdDictionaries:[],//宅基地代码
@@ -290,6 +317,7 @@ export default {
       tcqllx:'整体退出',
       tclx:'有偿退出',
       tcfs:'使用权',
+      yctcfs:'暂时退出',
       xb:'男',
       bcfs:'',
       zjddm:'',
@@ -297,6 +325,7 @@ export default {
       showtcqllx: false,
       showtclx: false,
       showtcfs: false,
+      showyctcfs: false,
       showxb: false,
       showbcfs: false,
       showzjddm: false,
@@ -378,6 +407,10 @@ export default {
           this.bcfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
         }
       });
+      this.$set(this.circulation, 'yctcfs', "1");
+      this.$set(this.circulation, 'bcfs', "01");
+      this.$set(this.circulation, 'bcje', 0.00);
+      this.$set(this.circulation, 'dmfzwbc', 0.00);
       //宅基地代码
       /*zjdzd().then(zjdRes => {
         for( let i = 0 ; i < zjdRes.rows.length ; i++){
@@ -459,6 +492,11 @@ export default {
       this.circulation.tcfs = data.value;
       this.showtcfs = false;
     },
+    onConfirmYctcfs(data){
+      this.yctcfs = data.text;
+      this.circulation.yctcfs = data.value;
+      this.showyctcfs = false;
+    },
     onConfirmBcfs(data){
       this.bcfs = data.text;
       this.circulation.bcfs = data.value;

src/views/sunVillage_info/paidExit/paidExitDetail.vue

@@ -243,6 +243,36 @@
       <van-field readonly v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <van-field readonly v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
       <van-field readonly v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+      <p class="main_title">补偿信息</p>
+      <van-field readonly v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+      <van-field readonly v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+      <field-select
+        readonly
+        v-model="circulation.yctcfs"
+        label="退出类型"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/system/dict/data/type/yctcfs"
+        :on-remote-response="'data'"
+      />
+      <field-select
+        readonly
+        v-model="circulation.bcfs"
+        label="补偿方式"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/system/dict/data/type/bcfs"
+        :on-remote-response="'data'"
+      />
+      <field-date-picker
+        readonly
+        v-model="circulation.bcsj"
+        label="补偿时间"
+        placeholder="选择日期"
+        formatter="yyyy-MM-dd"
+      />
       <p class="main_title">其他</p>
 
       <van-field readonly v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>

src/views/sunVillage_info/paidExit/paidExitModify.vue

@@ -181,6 +181,33 @@
       <van-field v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <van-field v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
       <van-field v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+      <p class="main_title">补偿信息</p>
+      <van-field v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+      <van-field v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+      <field-select
+        v-model="circulation.yctcfs"
+        label="退出类型"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/system/dict/data/type/yctcfs"
+        :on-remote-response="'data'"
+      />
+      <field-select
+        v-model="circulation.bcfs"
+        label="补偿方式"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/system/dict/data/type/bcfs"
+        :on-remote-response="'data'"
+      />
+      <field-date-picker
+        v-model="circulation.bcsj"
+        label="补偿时间"
+        placeholder="选择日期"
+        formatter="yyyy-MM-dd"
+      />
       <p class="main_title">其他</p>
 
       <van-field v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>

src/views/yinnong/homestead/freeExit/freeExitAdd.vue

@@ -190,6 +190,24 @@
         <van-field v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
         <van-field v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
         <van-field v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+        <p class="main_title">补偿信息</p>
+        <van-field v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+        <van-field v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+        <field-select
+          v-model="circulation.bcfs"
+          label="补偿方式"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择退出类型"
+          remote-url="/system/dict/data/type/bcfs"
+          :on-remote-response="'data'"
+        />
+        <field-date-picker
+          v-model="circulation.bcsj"
+          label="补偿时间"
+          placeholder="选择日期"
+          formatter="yyyy-MM-dd"
+        />
         <p class="main_title">其他</p>
 
         <van-field v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>
@@ -371,6 +389,9 @@ export default {
           this.bcfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
         }
       });
+      this.$set(this.circulation, 'bcfs', "01");
+      this.$set(this.circulation, 'bcje', 0.00);
+      this.$set(this.circulation, 'dmfzwbc', 0.00);
       //宅基地代码
       /*zjdzd().then(zjdRes => {
         for( let i = 0 ; i < zjdRes.rows.length ; i++){

src/views/yinnong/homestead/freeExit/freeExitDetail.vue

@@ -243,6 +243,26 @@
       <van-field readonly v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <van-field readonly v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
       <van-field readonly v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+      <p class="main_title">补偿信息</p>
+      <van-field readonly v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+      <van-field readonly v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+      <field-select
+        readonly
+        v-model="circulation.bcfs"
+        label="补偿方式"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/system/dict/data/type/bcfs"
+        :on-remote-response="'data'"
+      />
+      <field-date-picker
+        readonly
+        v-model="circulation.bcsj"
+        label="补偿时间"
+        placeholder="选择日期"
+        formatter="yyyy-MM-dd"
+      />
       <p class="main_title">其他</p>
 
       <van-field readonly v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>

src/views/yinnong/homestead/freeExit/freeExitModify.vue

@@ -181,6 +181,24 @@
       <van-field v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <van-field v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
       <van-field v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+      <p class="main_title">补偿信息</p>
+      <van-field  v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+      <van-field  v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+      <field-select
+        v-model="circulation.bcfs"
+        label="补偿方式"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/system/dict/data/type/bcfs"
+        :on-remote-response="'data'"
+      />
+      <field-date-picker
+        v-model="circulation.bcsj"
+        label="补偿时间"
+        placeholder="选择日期"
+        formatter="yyyy-MM-dd"
+      />
       <p class="main_title">其他</p>
 
       <van-field v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>

src/views/yinnong/homestead/paidExit/paidExitDetail.vue

@@ -243,6 +243,36 @@
     <van-field readonly v-model="circulation.xjzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
     <van-field readonly v-model="circulation.xqszsh" label="权属证书号" placeholder="请输入权属证书号" input-align="right" label-width="auto" />
     <van-field readonly v-model="circulation.xjzdd" label="居住地点" placeholder="请输入居住地点" input-align="right" label-width="auto" />
+    <p class="main_title">补偿信息</p>
+    <van-field readonly v-model="circulation.bcje" label="宅基地补偿" placeholder="宅基地补偿" input-align="right" label-width="auto"  type="number"/>
+    <van-field readonly v-model="circulation.dmfzwbc" label="地面附着物补偿" placeholder="地面附着物补偿" input-align="right" label-width="auto"  type="number"/>
+    <field-select
+      readonly
+      v-model="circulation.yctcfs"
+      label="退出类型"
+      value-key="dictLabel"
+      data-key="dictValue"
+      placeholder="选择退出类型"
+      remote-url="/system/dict/data/type/yctcfs"
+      :on-remote-response="'data'"
+    />
+    <field-select
+      readonly
+      v-model="circulation.bcfs"
+      label="补偿方式"
+      value-key="dictLabel"
+      data-key="dictValue"
+      placeholder="选择退出类型"
+      remote-url="/system/dict/data/type/bcfs"
+      :on-remote-response="'data'"
+    />
+    <field-date-picker
+      readonly
+      v-model="circulation.bcsj"
+      label="补偿时间"
+      placeholder="选择日期"
+      formatter="yyyy-MM-dd"
+    />
     <p class="main_title">其他</p>
 
     <van-field readonly v-model="circulation.sqly" label="申请理由" placeholder="请输入申请理由" input-align="right" label-width="auto"/>

src/views/yinnong/homestead/paidUtilize/paidUtilizeAdd.vue

@@ -11,42 +11,22 @@
       </template>
     </van-nav-bar>
     <div class="main_box">
+      <van-field v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+      <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
+        <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
+          {{item.sqrxm}}
+        </van-cell>
+      </div>
       <van-field
         readonly
-        clickable
-        v-model="circulation.shyqrdm"
-        label="使用权人"
-        placeholder="请选择"
-        @click="showshyqrdm = true"
-        input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showshyqrdm" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="shyqrdmDictionaries"
-          @confirm="onConfirmShyqrdm"
-          @cancel="showshyqrdm = false"
-        />
-      </van-popup>
-      <van-field
-        readonly
-        clickable
         v-model="circulation.zjddm"
         label="宅基地代码"
-        placeholder="请选择"
-        @click="showzjddm = true"
         input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showzjddm" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjdDictionaries"
-          @confirm="onConfirmZjddm"
-          @cancel="showzjddm = false"
-        />
-      </van-popup>
+      >
+        <template #button>
+          <van-button size="small" @click="mapLook" type="primary">查看地图</van-button>
+        </template>
+      </van-field>
 <!--      <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto"/>-->
       <van-field
         readonly
@@ -75,8 +55,8 @@
         <template #right-icon>
 <!--          @change="designPaperChange"-->
           <van-radio-group v-model="circulation.sfyhdz" direction="horizontal">
-            <van-radio name="Y">是</van-radio>
-            <van-radio name="N">否</van-radio  >
+            <van-radio name="1">是</van-radio>
+            <van-radio name="0">否</van-radio  >
           </van-radio-group>
         </template>
       </van-cell>
@@ -134,7 +114,9 @@
       <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
     </div>
-
+    <van-dialog v-model="mapShow" show-cancel-button>
+      <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm" :landStatus="landStatus" :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+    </van-dialog>
     <div style="padding: 16px 0;">
       <van-row>
         <van-col span="12" align="center">
@@ -151,9 +133,12 @@
 
 <script>
   import { zjdzd } from "@/api/onlineHome/homestead/circulation";
-  import { ycsyAdd , listByDeptId } from "@/api/onlineHome/homestead/paidUtilize";
+  import { ycsyAdd  } from "@/api/onlineHome/homestead/paidUtilize";
+  import {  getShyqrs,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
+  import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   export default {
     name: "paidUtilizeAdd",
+    components: {MapGisObtainTc},
     data() {
       return {
         tcqllxDictionaries:[],//退出权利类型
@@ -163,14 +148,15 @@
         bcfsDictionaries:[],//补偿方式
         zjdDictionaries:[],//宅基地代码
         shyqrdmDictionaries:[],//使用权人
-
+        getObligeeOptions:[],//下拉框列表
+        landStatus:"1",
         tcqllx:'',
         tclx:'',
         tcfs:'',
         zjlx:'',
         bcfs:'',
         zjddm:'',
-
+        sysFarmer:{deptId:this.$store.state.user.loginDeptId,memberName:""},
         showtcqllx: false,
         showtclx: false,
         showtcfs: false,
@@ -180,7 +166,8 @@
         showshyqrdm: false,
         showycsykssj: false,
         showycsydqsj: false,
-
+        showDropList: false,//是否显示下拉框
+        mapShow: false,
         circulation:{},
         minDate: new Date(),
         maxDate: new Date(2025, 10, 1),
@@ -228,12 +215,75 @@
               this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
             }
           });
-          //使用权人代码
-          listByDeptId().then(zjdRes => {
-            for (let i = 0; i < zjdRes.rows.length; i++) {
-              this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
+          // //使用权人代码
+          // listByDeptId().then(zjdRes => {
+          //   for (let i = 0; i < zjdRes.rows.length; i++) {
+          //     this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
+          //   }
+          // });
+      },
+      shyqrdmxmChange(val){
+        this.$set(this.circulation, "shyqrdbxm", val.sqrxm);
+        this.$set(this.circulation, "deptId", val.deptId);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+        this.getObligeeOptions=[];
+        this.showDropList = false;
+      },
+      /** 查找地图中宅基地 */
+      closeMoule: function (data) {
+        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);
+          }
+        });
+      },
+      /** 模糊查询人员信息 */
+      remoteTransfereeMethod(query) {
+        if (query !== "") {
+          getShyqrs({shyqrdbxm:query,status:1,deptId:this.sysFarmer.deptId}).then((response) => {
+            if (response.code == 200) {
+              this.getObligeeOptions = response.rows.map(function (item) {
+                return {
+                  sqrxm:item.shyqrdbxm,
+                  sqrxb:item.xb,
+                  sqrzjhm:item.shyqrdbzjhm,
+                  sqrnhdm:item.nhdm,
+                  sqrzjlx:item.shyqrdbzjlx,
+                  sqrdh:item.dh,
+                  gyfs:item.gyfs,
+                  dz:item.dz,
+                  deptId:item.deptId,
+                  deptName:item.deptName,
+                  zjddm:item.zjddm,
+                }
+              })
+              //设置模糊查询的下拉框和滚动条
+              if (this.getObligeeOptions.length > 0) {
+                this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
+                //设置模糊查询的和滚动条
+                this.$nextTick(() => {
+                  if (this.getObligeeOptions.length > 4) {
+                    let height = document.getElementById("vanCell").offsetHeight * 4;
+                    document.getElementById("dropList").style.height = height + "px";
+                    document.getElementById("dropList").style.overflow = "scroll";
+                  } else {
+                    document.getElementById("dropList").style.height = "";
+                    document.getElementById("dropList").style.overflow = "visible";
+                  }
+                });
+              } else {
+                this.showDropList = false;
+              }
             }
           });
+        } else {
+          this.getObligeeOptions = [];
+          this.showDropList = false;
+        }
       },
       onConfirmZjddm(data){
         console.log(data)
@@ -280,6 +330,12 @@
       goEdit(){
         window.location.replace("paidUtilizeList")
       },
+      mapLook(){
+        this.mapShow = true;
+        setTimeout(() => {
+          this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+        },1000);
+      },
       goSubmit(){
         ycsyAdd(this.circulation).then(response => {
           if(response.code = 200){

src/views/yinnong/homestead/paidUtilize/paidUtilizeDteail.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看有偿使用</p>
+        <p style="font-weight: bold;">有偿使用</p>
       </template>
     </van-nav-bar>
     <div class="main_box">
@@ -22,7 +22,11 @@
         v-model="circulation.zjddm"
         label="宅基地代码"
         input-align="right"
-      />
+      >
+        <template #button>
+          <van-button size="small" @click="mapLook" type="primary">查看地图</van-button>
+        </template>
+      </van-field>
       <van-field
         readonly
         v-model="zjlx"
@@ -52,6 +56,9 @@
         input-align="right"
         label-width="auto"
       />
+      <van-dialog v-model="mapShow" show-cancel-button>
+        <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.sqrxm" :landStatus="landStatus" :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+      </van-dialog>
       <van-field readonly v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto"/>
       <van-field readonly v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" input-align="right" label-width="auto"/>
       <van-field readonly v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right" label-width="auto"/>
@@ -64,8 +71,11 @@
 <script>
   import { zjdzd } from "@/api/onlineHome/homestead/circulation";
   import { zyyctcEdit , getYcsy , ycsyEdit } from "@/api/onlineHome/homestead/paidUtilize";
+  import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
+  import $ from "jquery";
   export default {
     name: "paidUtilizeDteail",
+    components: {MapGisObtainTc},
     data() {
       return {
         tcqllxDictionaries:[],//退出权利类型
@@ -75,7 +85,7 @@
         bcfsDictionaries:[],//补偿方式
         zjdDictionaries:[],//宅基地代码
         shyqrdmDictionaries:[],//使用权人
-
+        landStatus:"1",
         tcqllx:'',
         tclx:'',
         tcfs:'',
@@ -94,9 +104,7 @@
         showycsydqsj: false,
 
         circulation:{},
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(),
+        mapShow: false,
       };
     },
     created() {
@@ -149,6 +157,10 @@
           this.circulation = response.data;
         });
       },
+      /** 查找地图中定位点 */
+      MapTag: function (data) {
+        //this.form.theGeom = data;
+      },
       onConfirmZjddm(data){
         console.log(data)
         this.circulation.zjddm = data;
@@ -203,7 +215,13 @@
             },1000)
           }
         });
-      }
+      },
+      mapLook(){
+        this.mapShow =true;
+        setTimeout(() => {
+          this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+        },1000)
+      },
     },
   }
 </script>
@@ -232,4 +250,12 @@
     background-color: #1D6FE9;
 
   }
+  .mapBox{
+    position: relative;
+  .mapBox_button{
+    position: absolute;
+    top: 0.2rem;
+    right: 2%;
+  }
+  }
 </style>

src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue

@@ -1,151 +1,133 @@
 <template>
-    <div class="app-container">
-      <van-nav-bar
-        left-arrow
-        fixed
-        placeholder
-        @click-left="$router.back(-1)"
-        @click-right="goAdd"
-      >
-        <template #title>
-          <p style="font-weight: bold;">有偿使用</p>
-        </template>
-        <template #right>
-          <van-icon name="add" size="18" />
-        </template>
-      </van-nav-bar>
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="getList"
-      >
-        <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.zjddm" :value="item.auditStatus" center :to="{name:'paidUtilizeDteail', query: {id:item.id}}" >
-            <template #icon>
-              <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
-            </template>
-            <template #label>
-              <p>{{item.shyqrdm}}</p>
-            </template>
-          </van-cell>
-          <template #right>
-            <van-row>
-              <van-col>
-                <van-button color="#7DDA4F" v-if="item.auditStatus=='草稿'" square text="提交" @click="goSubmit(item.id,index)" type="primary" class="delete-button" />
-              </van-col>
-              <van-col>
-                <van-button square text="修改" v-if="item.auditStatus=='草稿'" :to="{name:'paidUtilizeModify', query: {id:item.id}}" type="info" class="delete-button" />
-              </van-col>
-              <van-col>
-                <van-button square text="删除" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
-              </van-col>
-            </van-row>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+      @click-right="goAdd"
+    >
+      <template #title>
+        <p style="font-weight: bold;">有偿使用</p>
+      </template>
+              <template #right>
+                <van-icon name="add" size="18" />
+              </template>
+    </van-nav-bar>
+    <van-list
+      v-model="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="getList"
+    >
+      <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
+        <van-cell :title="item.shyqrdbxm" center :to="{name:'paidUtilizeDteail', query: {id:item.id}}" >
+          <template #icon>
+            <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
           </template>
-        </van-swipe-cell>
-      </van-list>
-    </div>
+          <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>
+          </template>
+        </van-cell>
+                  <template #right>
+                    <van-row>
+                      <van-col>
+                        <van-button square text="修改" :to="{name:'paidUtilizeModify', query: {id:item.id}}" type="info" class="delete-button" />
+                      </van-col>
+                      <van-col>
+                        <van-button square text="删除"  @click="deleteList(item.id,index)" type="danger" class="delete-button" />
+                      </van-col>
+                    </van-row>
+                  </template>
+      </van-swipe-cell>
+    </van-list>
+  </div>
 </template>
 
 <script>
-import { getList , removeList , submitApply } from "@/api/onlineHome/homestead/paidUtilize";
-export default {
-  name: "paidUtilizeList",
-  data() {
-    return {
-      applicationList:[],
-      houseApplyStatus:[],
-      tcqllxStatus:[],
-      tclxStatus:[],
-      tcfsStatus:[],
-      auditStatus:[],
-      loading: false,
-      finished: false,
-      queryParams:{
-        pageNum:1,
-        pageSize:10,
-        orderByColumn:'id',
-        isAsc:'desc'
-      }
-    };
-  },
-  created() {
-    this.houseGetDicts("tcqllx").then((res) => {
-      this.tcqllxStatus = res.data;
-    });
-    this.houseGetDicts("tclx").then((res) => {
-      this.tclxStatus = res.data;
-    });
-    this.houseGetDicts("tcfs").then((res) => {
-      this.tcfsStatus = res.data;
-    });
-    this.houseGetDicts("audit_status").then((res) => {
-      this.auditStatus = res.data;
-    });
-  },
-  methods: {
-    goAdd(){
-      window.location = 'paidUtilizeAdd';
-    },
-    getList(){
-      setTimeout(() => {
-        getList(this.queryParams).then(response => {
-          console.log(response)
-          for (var i = 0; i < response.rows.length; i++) {
-            response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
-            response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
-            response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
-            response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
-            this.applicationList.push(response.rows[i]);
-          }
-          if(this.applicationList.length >= response.total){
-            this.finished = true;
-            return;
-          }else{
-            this.loading = false;
-            this.queryParams.pageNum += 1 ;
-          }
-        });
-      }, 1000);
+  import { getList , removeList  } from "@/api/onlineHome/homestead/paidUtilize";
+  import {getGeoServerConfigKey} from "@/api/system/config";
+  export default {
+    name: "paidUtilizeList",
+    data() {
+      return {
+        applicationList:[],
+        houseApplyStatus:[],
+        tcqllxStatus:[],
+        tclxStatus:[],
+        tcfsStatus:[],
+        auditStatus:[],
+        loading: false,
+        finished: false,
+        queryParams:{
+          pageNum:1,
+          pageSize:10,
+          orderByColumn:'id',
+          isAsc:'desc'
+        },
+        //地图服务地址
+        mapGeoServerUrl:"",
+      };
     },
-    deleteList(id,index){
-      this.$dialog.confirm({
-        message: '您确认删除申请草稿？',
-      })
-      .then(() => {
-        // on confirm
-        this.applicationList.splice(index,1)
-        removeList(id).then(res => {
-          if(res.code = 200){
-            this.$toast.success('删除成功');
-          }
-        });
-      })
-      .catch(() => {
-        // on cancel
+    created() {
+      this.houseGetDicts("tcqllx").then((res) => {
+        this.tcqllxStatus = res.data;
       });
-    },
-    goSubmit(id,index){
-      this.$dialog.confirm({
-        message: '您确认提交草稿？',
-      })
-      .then(() => {
-        // on confirm
-        submitApply(id).then(res => {
-          if(res.code = 200){
-            this.$toast.success('提交成功！');
-            setTimeout(function(){
-              history.go(0)
-            },2000)
-          }
-        });
-      })
-      .catch(() => {
-        // on cancel
+      this.houseGetDicts("tclx").then((res) => {
+        this.tclxStatus = res.data;
+      });
+      this.houseGetDicts("tcfs").then((res) => {
+        this.tcfsStatus = res.data;
       });
-    }
-  },
-}
+      this.houseGetDicts("audit_status").then((res) => {
+        this.auditStatus = res.data;
+      });
+    },
+    methods: {
+      goAdd(){
+        window.location = 'paidUtilizeAdd';
+      },
+      getList(){
+        setTimeout(() => {
+          getList(this.queryParams).then(response => {
+            console.log(response)
+            // for (var i = 0; i < response.rows.length; i++) {
+            //   response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
+            //   response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
+            //   response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
+            //   response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
+            //   this.applicationList.push(response.rows[i]);
+            // }
+            this.applicationList = response.rows;
+            if(this.applicationList.length >= response.total){
+              this.finished = true;
+              return;
+            }else{
+              this.loading = false;
+              this.queryParams.pageNum += 1 ;
+            }
+          });
+        }, 1000);
+      },
+      deleteList(id,index){
+        this.$dialog.confirm({
+          message: '您确认删除申请草稿？',
+        })
+          .then(() => {
+            // on confirm
+            this.applicationList.splice(index,1)
+            removeList(id).then(res => {
+              if(res.code = 200){
+                this.$toast.success('删除成功');
+              }
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
+    },
+  }
 </script>
 
 <style scoped lang="scss">

src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue

@@ -11,43 +11,23 @@
       </template>
     </van-nav-bar>
     <div class="main_box">
+      <van-field readonly v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+      <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
+        <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
+          {{item.sqrxm}}
+        </van-cell>
+      </div>
       <van-field
         readonly
-        clickable
-        v-model="circulation.shyqrdm"
-        label="使用权人"
-        placeholder="请选择"
-        @click="showshyqrdm = true"
-        input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showshyqrdm" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="shyqrdmDictionaries"
-          @confirm="onConfirmShyqrdm"
-          @cancel="showshyqrdm = false"
-        />
-      </van-popup>
-      <van-field
-        readonly
-        clickable
         v-model="circulation.zjddm"
         label="宅基地代码"
-        placeholder="请选择"
-        @click="showzjddm = true"
         input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showzjddm" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjdDictionaries"
-          @confirm="onConfirmZjddm"
-          @cancel="showzjddm = false"
-        />
-      </van-popup>
-<!--      <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto"/>-->
+      >
+        <template #button>
+          <van-button size="small" @click="mapLook" type="primary">查看地图</van-button>
+        </template>
+      </van-field>
+      <!--      <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto"/>-->
       <van-field
         readonly
         clickable
@@ -67,13 +47,13 @@
           @cancel="showzjlx = false"
         />
       </van-popup>
-      <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto"/>
+      <van-field readonly v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto"/>
       <van-field v-model="circulation.ycsyfs" label="有偿使用方式" placeholder="有偿使用方式" input-align="right" label-width="auto"/>
 
 
       <van-cell title="是否一户多宅">
         <template #right-icon>
-<!--          @change="designPaperChange"-->
+          <!--          @change="designPaperChange"-->
           <van-radio-group v-model="circulation.sfyhdz" direction="horizontal">
             <van-radio name="Y">是</van-radio>
             <van-radio name="N">否</van-radio  >
@@ -134,7 +114,9 @@
       <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
     </div>
-
+    <van-dialog v-model="mapShow" show-cancel-button>
+      <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm" :landStatus="landStatus" :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+    </van-dialog>
     <div style="padding: 16px 0;">
       <van-row>
         <van-col span="12" align="center">
@@ -151,9 +133,12 @@
 
 <script>
   import { zjdzd } from "@/api/onlineHome/homestead/circulation";
-  import { listByDeptId , getYcsy , ycsyEdit } from "@/api/onlineHome/homestead/paidUtilize";
+  import { ycsyEdit,getYcsy  } from "@/api/onlineHome/homestead/paidUtilize";
+  import {  getShyqrs,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
+  import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   export default {
-    name: "paidUtilizeModify",
+    name: "paidUtilizeAdd",
+    components: {MapGisObtainTc},
     data() {
       return {
         tcqllxDictionaries:[],//退出权利类型
@@ -163,14 +148,15 @@
         bcfsDictionaries:[],//补偿方式
         zjdDictionaries:[],//宅基地代码
         shyqrdmDictionaries:[],//使用权人
-
+        getObligeeOptions:[],//下拉框列表
+        landStatus:"1",
         tcqllx:'',
         tclx:'',
         tcfs:'',
         zjlx:'',
         bcfs:'',
         zjddm:'',
-
+        sysFarmer:{deptId:this.$store.state.user.loginDeptId,memberName:""},
         showtcqllx: false,
         showtclx: false,
         showtcfs: false,
@@ -180,7 +166,8 @@
         showshyqrdm: false,
         showycsykssj: false,
         showycsydqsj: false,
-
+        showDropList: false,//是否显示下拉框
+        mapShow: false,
         circulation:{},
         minDate: new Date(),
         maxDate: new Date(2025, 10, 1),
@@ -193,27 +180,6 @@
     methods: {
       getDictionaries(){
         getYcsy(this.$route.query.id).then(response => {
-          //退出权利类型
-          this.houseGetDicts("tcqllx").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.tcqllxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-            this.tcqllx = this.selectDictLabel(res.data, response.data.tcqllx);
-          });
-          //退出类型
-          this.houseGetDicts("tclx").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.tclxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-            this.tclx = this.selectDictLabel(res.data, response.data.tclx);
-          });
-          //退出方式
-          this.houseGetDicts("tcfs").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.tcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-            this.tcfs = this.selectDictLabel(res.data, response.data.tcfs);
-          });
           //申请人证件类型
           this.houseGetDicts("zjlx").then((res) => {
             for (var i = 0; i < res.data.length; i++) {
@@ -221,27 +187,132 @@
             }
             this.zjlx = this.selectDictLabel(res.data, response.data.sqrzjlx);
           });
-          //补偿方式
-          this.houseGetDicts("bcfs").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-            this.bcfs = this.selectDictLabel(res.data, response.data.bcfs);
-          });
-          //宅基地代码
-          zjdzd().then(zjdRes => {
-            for (let i = 0; i < zjdRes.rows.length; i++) {
-              this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
-            }
+          this.circulation = response.data;
+        });
+        //退出权利类型
+        this.houseGetDicts("tcqllx").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.tcqllxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //退出类型
+        this.houseGetDicts("tclx").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.tclxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //退出方式
+        this.houseGetDicts("tcfs").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.tcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //申请人证件类型
+        this.houseGetDicts("zjlx").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.zjlxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //补偿方式
+        this.houseGetDicts("bcfs").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //宅基地代码
+        zjdzd().then(zjdRes => {
+          for (let i = 0; i < zjdRes.rows.length; i++) {
+            this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
+          }
+        });
+        // //使用权人代码
+        // listByDeptId().then(zjdRes => {
+        //   for (let i = 0; i < zjdRes.rows.length; i++) {
+        //     this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
+        //   }
+        // });
+      },
+      shyqrdmxmChange(val){
+        this.$set(this.circulation, "shyqrdbxm", val.sqrxm);
+        this.$set(this.circulation, "deptId", val.deptId);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+        this.getObligeeOptions=[];
+        this.showDropList = false;
+      },
+      /** 查找地图中宅基地 */
+      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));
+            });
           });
-          //使用权人代码
-          listByDeptId().then(zjdRes => {
-            for (let i = 0; i < zjdRes.rows.length; i++) {
-              this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
+          // const baseImgUrl = this.$store.getters.baseRoutingUrl;
+          if(response.data.zdt != null && response.data.zdt !== ""){
+            this.$set(this.form, "xzzp", response.rows[0].zdt);
+          }
+        });
+      },
+      /** 模糊查询人员信息 */
+      remoteTransfereeMethod(query) {
+        if (query !== "") {
+          getShyqrs({shyqrdbxm:query,status:1,deptId:this.sysFarmer.deptId}).then((response) => {
+            if (response.code == 200) {
+              this.getObligeeOptions = response.rows.map(function (item) {
+                return {
+                  sqrxm:item.shyqrdbxm,
+                  sqrxb:item.xb,
+                  sqrzjhm:item.shyqrdbzjhm,
+                  sqrnhdm:item.nhdm,
+                  sqrzjlx:item.shyqrdbzjlx,
+                  sqrdh:item.dh,
+                  gyfs:item.gyfs,
+                  dz:item.dz,
+                  deptId:item.deptId,
+                  deptName:item.deptName,
+                  zjddm:item.zjddm,
+                }
+              })
+              //设置模糊查询的下拉框和滚动条
+              if (this.getObligeeOptions.length > 0) {
+                this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
+                //设置模糊查询的和滚动条
+                this.$nextTick(() => {
+                  if (this.getObligeeOptions.length > 4) {
+                    let height = document.getElementById("vanCell").offsetHeight * 4;
+                    document.getElementById("dropList").style.height = height + "px";
+                    document.getElementById("dropList").style.overflow = "scroll";
+                  } else {
+                    document.getElementById("dropList").style.height = "";
+                    document.getElementById("dropList").style.overflow = "visible";
+                  }
+                });
+              } else {
+                this.showDropList = false;
+              }
             }
           });
-          this.circulation = response.data;
-        });
+        } else {
+          this.getObligeeOptions = [];
+          this.showDropList = false;
+        }
       },
       onConfirmZjddm(data){
         console.log(data)
@@ -288,10 +359,16 @@
       goEdit(){
         window.location.replace("paidUtilizeList")
       },
+      mapLook(){
+        this.mapShow = true;
+        setTimeout(() => {
+          this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+        },1000);
+      },
       goSubmit(){
         ycsyEdit(this.circulation).then(response => {
           if(response.code = 200){
-            this.$toast.success('修改成功');
+            this.$toast.success('新增成功');
             setTimeout(function(){
               window.location.replace("paidUtilizeList")
             },1000)