宅基地系统-自定义审批、收费计划

src/api/audit/aaudit.js

@@ -0,0 +1,17 @@
+export const AAUDIT_INTENT = {
+  NONE: '', // 无
+  VIEW: 'VIEW', // 查看
+  AUDIT: 'audit', // 审批
+  HISTORY: 'history', // 审批历史
+  PIPELINE: 'pipeline', // 审批流程图
+};
+export const AAUDIT_STATUS = {
+  /*   READY    : "1", // 未提交
+    AUDITING : "3", // 审批中
+    PASS     : "5", // 审批通过
+    REJECT   : "7", // 审批驳回 */
+  READY    : "0", // 未提交
+  AUDITING : "1", // 审批中
+  PASS     : "3", // 审批通过
+  REJECT   : "2", // 审批驳回
+};

src/api/audit/aauditmodel.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询审批模板列表
+export function A_listAuditModel(query) {
+  return request({
+    url: '/open/home/mobile/modelList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询审批模板详细
+export function A_getAuditModel(id) {
+  return request({
+    url: '/approval/auditmodel/get/' + id,
+    method: 'get'
+  })
+}
+
+// 新增审批模板
+export function A_addAuditModel(data) {
+  return request({
+    url: '/approval/auditmodel/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改审批模板
+export function A_updateAuditModel(data) {
+  return request({
+    url: '/approval/auditmodel/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除审批模板
+export function A_deleteAuditModel(id) {
+  return request({
+    url: '/approval/auditmodel/remove/' + id,
+    method: 'post'
+  })
+}

src/api/audit/aauditpipeline.js

@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+// 我的待办列表
+export function A_myTodoList(query) {
+  return request({
+    url: '/approval/audit/todoList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 我的已办列表
+export function A_myDoneList(query) {
+  return request({
+    url: '/approval/audit/doneList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 审批历史列表
+export function A_auditHistoryList(id, query) {
+  return request({
+    url: '/approval/audit/historyList/' + id,
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取后台流程图地址
+export function A_pipelineImageUrl(no, format = 'png') {
+  return `/approval/audit/pipeline/${no}.${format}`;
+}
+
+// 审批状态列表
+export function A_pipelineState(no) {
+  return request({
+    url: '/approval/audit/pipelineState/' + no,
+    method: 'get',
+  })
+}
+
+// 审批批次列表
+export function A_auditBatchList(no) {
+  return request({
+    url: '/approval/audit/auditBatchList/' + no,
+    method: 'get',
+  })
+}
+
+// 审批历史详情
+export function A_auditHistoryDetail(id, parms) {
+  return request({
+    url: '/approval/audit/history/' + id,
+    method: 'get',
+    params: parms,
+  })
+}
+
+// 审批
+export function A_audit(data) {
+  return request({
+    url: '/approval/audit/audit',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 提交
+export function A_start(data) {
+  return request({
+    url: '/open/home/mobile/start',
+    method: 'post',
+    data: data,
+  })
+}

src/api/onlineHome/homestead/paidUtilize.js

@@ -43,8 +43,22 @@ export function ycsyAdd(data){
     data:data
   })
 }
-
-
+// 生成收费计划
+export function generateFeePlan(data) {
+  return request({
+    url: '/home/ycsy/generateFeePlan',
+    method: 'post',
+    data: data
+  })
+}
+//有偿使用超期
+export function overdueList(data) {
+  return request({
+    url:'/home/ycsy/overdueList',
+    method:'get',
+    params:data
+  })
+}
 //使用权人查询
 export function listByDeptId(){
   return request({

src/api/onlineHome/homestead/ycsysfmx.js

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 查询有偿收费明细列表
+export function listYcsysfmx(query) {
+  return request({
+    url: '/home/ycsysfmx/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 统计查询有偿收费明细列表
+export function statisticYcsysfmx(query) {
+  return request({
+    url: '/home/ycsysfmx/statistic',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出有偿收费明细
+export function exportYcsysfmx(query) {
+  return request({
+    url: '/home/ycsysfmx/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询有偿收费明细详细
+export function getYcsysfmx(id) {
+  return request({
+    url: '/home/ycsysfmx/get/' + id,
+    method: 'get',
+    params: arguments[1] || {}
+  })
+}
+
+// 新增有偿收费明细
+export function addYcsysfmx(data) {
+  return request({
+    url: '/home/ycsysfmx/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改有偿收费明细
+export function updateYcsysfmx(data) {
+  return request({
+    url: '/home/ycsysfmx/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除有偿收费明细
+export function delYcsysfmx(id) {
+  return request({
+    url: '/home/ycsysfmx/remove/' + id,
+    method: 'get'
+  })
+}
+

src/api/sunVillage_info/homestead/application.js

@@ -196,6 +196,22 @@ export function customSubmitWLHT(id) {
     method: 'post'
   })
 }
+//新增地房申请（新）
+export function submitApplication(id) {
+  return request({
+    url: '/open/home/mobile/submitApplication/' + id,
+    method: 'post'
+  })
+}
+
+// 新增地房申请-开工申请（新）
+export function submitStart(id) {
+  return request({
+    url: '/open/home/mobile/submitStart/'+id,
+    method: 'post',
+  })
+}
+
 // 新增地房申请-开工申请
 export function submitStartWLHT(id) {
   return request({
@@ -213,6 +229,14 @@ export function updateStart(data) {
   })
 }
 
+// 提交地房申请-验收意见(新)
+export function submitCheck(id) {
+  return request({
+    url: '/open/home/mobile/submitCheck/'+id,
+    method: 'post',
+  })
+}
+
 // 提交地房申请-验收意见(乌兰浩特 简化流程)
 export function submitEndWLHT(id) {
   return request({
@@ -257,3 +281,12 @@ export function updateOpretion(id) {
     method: 'post'
   })
 }
+
+
+//获取用地建房申请状态信息
+export function getHomeApplyStatus(id) {
+  return request({
+    url: '/open/home/mobile/homeApplyStatusNew/'+id,
+    method: 'get'
+  })
+}

src/api/sunVillage_info/homestead/paidExit.js

@@ -87,7 +87,12 @@ export function zyyctcApply(id){
     method:'post',
   })
 }
-
+export function zyyctcApplyNew(id){
+  return request({
+    url:'/open/home/mobile/paidExitSubmitApplyNew/'+id,
+    method:'post',
+  })
+}
 // 查询权利人列表
 export function getShyqrs(query) {
   return request({

src/permission.js

@@ -109,11 +109,15 @@ const whiteList = [
   '/sunVillage_info/list_message_add',   //详情页
   '/sunVillage_info/list_message_detail',   //详情页
   '/sunVillage_info/homeApplication/applicationList',   //列表页面
+  '/sunVillage_info/homeApplication/applicationNewList',   //列表页面
   '/sunVillage_info/proposerLite',
+  '/sunVillage_info/proposerLiteNew',
   '/sunVillage_info/paidExit/paidExitList',   //列表页面
+  '/sunVillage_info/paidExit/paidExitNewList',   //宅基地退出列表页面(新)
   '/sunVillage_info/paidExitAdd',
   '/sunVillage_info/paidExitModify',
   '/sunVillage_info/paidExitDetail',
+  '/sunVillage_info/paidExitDetailNew',
   '/sunVillage_info/arbitrationList',
   '/sunVillage_info/arbitrationDetail',
   '/sunVillage_info/familyMember',

src/router/index.js

@@ -1068,6 +1068,33 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeList'], resolve)
   },
+  {
+    path: '/paidUtilizeCqList',
+    name: 'paidUtilizeCqList',
+    meta: {
+      title: '有偿使用',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/homestead/paidUtilize/paidUtilizeCqList'], resolve)
+  },
+  {
+    path: '/paidUtilizeFeeplanList',
+    name: 'paidUtilizeFeeplanList',
+    meta: {
+      title: '收费计划',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList'], resolve)
+  },
+  {
+    path: '/paidUtilizeFeeplanDteail',
+    name: 'paidUtilizeFeeplanDteail',
+    meta: {
+      title: '收费计划详情',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanDteail'], resolve)
+  },
   {
     path: '/paidUtilizeModify',
     name: 'paidUtilizeModify',
@@ -1988,13 +2015,13 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/yinnong/done'], resolve)
   },
   {
-    path: '/yinnong/doneCompleted/done',
-    name: 'yinnongDoneCompletedDone',
+    path: '/yinnong/doneCompleted/doneNew',
+    name: 'yinnongDoneCompletedDoneNew',
     meta: {
       title: '我的已办',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/yinnong/doneCompleted/done'], resolve)
+    component: (resolve) => require(['@/views/yinnong/doneCompleted/doneNew'], resolve)
   },
   {
     path: '/yinnong/doneCompleted/completed',
@@ -2005,6 +2032,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/doneCompleted/completed'], resolve)
   },
+  {
+    path: '/yinnong/doneCompleted/completedNew',
+    name: 'yinnongDoneCompletedCompletedNew',
+    meta: {
+      title: '我的待办(新)',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/doneCompleted/completedNew'], resolve)
+  },
   {
     path: '/yinnong/advice',
     name: 'yinnongAdvice',
@@ -4002,6 +4038,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/homeApplication/applicationList'], resolve)
   },
+  { ////阳光村务（新）-- 宅基地申请
+    path: '/sunVillage_info/homeApplication/applicationNewList',
+    name: 'sunVillageInfoApplicationNewList',
+    meta: {
+      title: '宅基地申请(新)',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/homeApplication/applicationNewList'], resolve)
+  },
   {
     path: '/sunVillage_info/proposerLite',
     name: 'sunVillageInfoProposerLite',
@@ -4011,6 +4056,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLite'], resolve)
   },
+  {
+    path: '/sunVillage_info/proposerLiteNew',
+    name: 'sunVillageInfoProposerLiteNew',
+    meta: {
+      title: '农村宅基地申请(新)',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/homeApplication/proposerLiteNew'], resolve)
+  },
   {
     path: '/homesteadProposerLite',
     name: 'homesteadProposerLite',
@@ -4029,6 +4083,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitList'], resolve)
   },
+  {
+    path: '/sunVillage_info/paidExit/paidExitNewList',
+    name: 'sunVillageInfoPaidExitNewList',
+    meta: {
+      title: '有偿退出',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitNewList'], resolve)
+  },
   {
     path: '/sunVillage_info/paidExitAdd',
     name: 'sunVillageInfoPaidExitAdd',
@@ -4056,6 +4119,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitDetail'], resolve)
   },
+  {
+    path: '/sunVillage_info/paidExitDetailNew',
+    name: 'sunVillageInfoPaidExitDetailNew',
+    meta: {
+      title: '有偿退出审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitDetailNew'], resolve)
+  },
   {
     path: '/sunVillage_info/arbitrationList',
     name: 'sunVillageInfoArbitrationList',

src/views/sunVillage_info/homeApplication/applicationNewList.vue

@@ -0,0 +1,293 @@
+<template>
+    <div class="app-container">
+<!--      <van-nav-bar-->
+<!--        left-arrow-->
+<!--        fixed-->
+<!--        placeholder-->
+<!--        @click-left="$router.back(-1)"-->
+<!--        @click-right="goAddLite()"-->
+<!--      >-->
+<!--        <template #title>-->
+<!--          <p style="font-weight: bold;">宅基地申请</p>-->
+<!--        </template>-->
+<!--        <template #right>-->
+<!--          <van-icon name="add" size="18"/>-->
+<!--        </template>-->
+<!--      </van-nav-bar>-->
+
+      <div class="header_main">
+        宅基地申请
+        <div class="return_btn" @click="onClickLeft"></div>
+        <div class="add_btn" @click="goAddLite"></div>
+      </div>
+
+      <van-pull-refresh v-model="refreshing" @refresh="getList()">
+        <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList('+1')"
+      >
+        <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
+          <van-cell :title="item.sqhhzxm" center @click="viewItem(item)">
+<!--          <van-cell :title="item.ywh" :value="item.houseApplyStatusName" center @click="viewItem(item)">-->
+<!--            <template #icon>-->
+<!--              <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />-->
+<!--            </template>-->
+<!--            <template #label>-->
+<!--              <p>{{item.projectName}}</p>-->
+<!--            </template>-->
+            <template #icon>
+              <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />
+            </template>
+            <span v-if="item.auditStatus === '0'">{{ formatDict(houseApplyStatus, item.homeApplyStatus) }} </span>
+            <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.homeApplyStatus) + ' ● 已驳回' }} </span>
+            <span  v-else style="color: #67c23a;">{{ formatDict(houseApplyStatus, item.homeApplyStatus) }} </span>
+            <template #label>
+              <p>{{item.projectName}}</p>
+            </template>
+          </van-cell>
+          <template #right>
+            <van-row>
+              <van-col>
+                <van-button square text="提交" type="primary" v-if="item.homeApplyStatus=='11' || item.homeApplyStatus=='31' || item.homeApplyStatus=='71'" @click="submitApplyProposer(item)" class="delete-button" />
+              </van-col>
+              <van-col>
+                <van-button square text="修改" type="info" v-if="item.homeApplyStatus=='11' || item.homeApplyStatus=='31' || item.homeApplyStatus=='71'" :to="{name:'sunVillageInfoProposerLite', query: {id:item.id, type: 'modify'}}" class="delete-button" />
+              </van-col>
+              <van-col>
+                <van-button square text="删除" type="danger" v-if="item.homeApplyStatus=='11'" @click="deleteList(item.id,index)" class="delete-button" />
+              </van-col>
+            </van-row>
+          </template>
+        </van-swipe-cell>
+      </van-list>
+      </van-pull-refresh>
+    </div>
+</template>
+
+<script>
+import { getList , removeList } from "@/api/sunVillage_info/homestead/application";
+import { customSubmitWLHT, submitStartWLHT, submitEndWLHT,} from "@/api/sunVillage_info/homestead/application";
+import {updateOpretion} from "@/api/sunVillage_info/homestead/application";
+import Cookies from "js-cookie";
+export default {
+  name: "applicationList",
+  data() {
+    return {
+      applicationList:[],
+      houseApplyStatus:[],
+      loading: false,
+      finished: false,
+      refreshing: false,
+      deptId:null,
+      idcard:null,
+      total: 0,
+      queryParams:{
+        pageNum:1,
+        pageSize:10,
+        deptId:null,
+        orderByColumn:'createTime',
+        isAsc:'desc'
+      }
+    };
+  },
+  created() {
+    this.houseGetDicts("home_stage_status").then((response) => {
+      this.houseApplyStatus = response.data;
+    });
+    let user =  JSON.parse(Cookies.get('user'));
+    this.$set(this.queryParams, "deptId", user.deptId);
+    this.$set(this.queryParams, "sqhhzsfzh", user.idcard);
+    console.info( user)
+    this.getList();
+  },
+  methods: {
+    goAdd(){
+      window.location = 'applicationAdd';
+    },
+    goAddLite(){
+      //window.location = 'applicationAdd'
+      this.$router.push({name:'sunVillageInfoProposerLiteNew',query:{type:"add"}})
+    },
+    viewItem(row){
+      let type = row.houseApplyStatus == '11' // 申请草稿
+        || row.houseApplyStatus == '1F' // 申请通过
+        || row.houseApplyStatus == '31' // 开工草稿
+        || row.houseApplyStatus == '3F' // 开工通过
+        || row.houseApplyStatus == '71' // 验收草稿
+          ? 'modify' : 'view';
+      this.$router.push({name:'sunVillageInfoProposerLiteNew',query:{type:type,id:row.id}})
+    },
+    getList(target){
+      let type = typeof (target);
+      console.log(type, target);
+      if(target && this.finished)
+        return;
+      if (target === 0) {
+        this.refreshing = true;
+        this.finished = true;
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.applicationList = [];
+      }
+      else if (type === 'number')
+        this.queryParams.pageNum = target;
+      else if (type === 'string') {
+        this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
+      }
+      else
+      {
+        this.refreshing = true;
+        this.finished = true;
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.applicationList = []
+      }
+      getList(this.queryParams).then(response => {
+        console.log(response)
+        if (response.rows.length === 0) {
+          this.finished = true;
+          return;
+        }
+        for (var i = 0; i < response.rows.length; i++) {
+          /*var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus);
+          // if(response.rows[i].auditStatus !== '0' && response.rows[i].auditStatus === '2'){
+          //   houseApplyStatusName = houseApplyStatusName+ ' ● 已驳回';
+          // }
+          response.rows[i].houseApplyStatusName = houseApplyStatusName;*/
+          this.applicationList.push(response.rows[i]);
+        }
+        this.total += response.rows.length;
+        this.finished = this.total >= response.total;
+      }).finally(() => {
+        this.loading = false;
+        this.refreshing = false;
+      });
+    },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
+    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
+      });
+    },
+    refresh() {
+      this.getList(); return;
+      this.applicationList = [];
+      this.queryParams.pageNum = 1;
+      this.refreshing = true;
+      this.finished = false;
+    },
+    submitApplyProposer(item) {
+        this.$router.push({name:'sunVillageInfoProposerLiteNew',query:{type:"edit",id:item.id}})
+        // if(item.homeApplyStatus === '11'){
+        //   customSubmitWLHT(item.id).then((resp) => {
+        //     this.$toast.success("提交成功");
+        //     this.refresh();
+        //   }).catch((e) => {
+        //     this.$toast.fail("提交失败!");
+        //   });
+        // }else if(item.homeApplyStatus === '31'){
+        //   submitStartWLHT(item.id).then((resp) => {
+        //     this.$toast.success("提交成功");
+        //     this.refresh();
+        //   }).catch((e) => {
+        //     this.$toast.fail("提交失败!");
+        //   });
+        // }else if(item.homeApplyStatus === '71'){
+        //   submitEndWLHT(item.id).then((resp) => {
+        //     this.$toast.success("提交成功");
+        //     this.refresh();
+        //   }).catch((e) => {
+        //     this.$toast.fail("提交失败!");
+        //   });
+        // }
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    .header_main{
+      height: 116px;
+      background: url('../../../assets/images/sunVillage_info/list_head_green.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;
+      }
+    }
+  }
+  /deep/.van-list{
+    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;
+  }
+  .van-row{
+    height: 100%;
+  }
+  .van-col{
+    height: 100%;
+  }
+  .delete-button {
+    height: 100%;
+  }
+</style>

src/views/sunVillage_info/index_code_rights.vue

@@ -244,6 +244,9 @@
               &:nth-child(5n+1){
                  margin-top: 15PX;
                }
+              &:nth-child(6n+1){
+                 margin-top: 15PX;
+               }
               &:nth-child(1){
                 margin-top: 0PX;
               }

src/views/sunVillage_info/paidExit/paidExitDetailNew.vue

@@ -0,0 +1,876 @@
+<template>
+    <div class="app-container">
+<!--      <van-nav-bar-->
+<!--        left-arrow-->
+<!--        fixed-->
+<!--        placeholder-->
+<!--        @click-left="$router.back(-1)"-->
+<!--      >-->
+<!--        <template #title>-->
+<!--          <p style="font-weight: bold;">有偿退出</p>-->
+<!--        </template>-->
+<!--      </van-nav-bar>-->
+
+      <div class="header_main">
+        有偿退出
+        <div class="return_btn" @click="onClickLeft"></div>
+        <!--      <div class="add_btn" @click="goAdd"></div>-->
+      </div>
+
+      <div class="main_box">
+        <!--        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>-->
+        <van-field  readonly v-model="circulation.sqrxm" 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.zjddm"-->
+        <!--          label="宅基地代码"-->
+        <!--          placeholder="请选择"-->
+        <!--          @click="remoteProposerMethod"-->
+        <!--          input-align="right"-->
+        <!--          right-icon="arrow-down" :rules="[{ required: true }]" required-->
+        <!--        />-->
+        <!--        <van-popup v-model="showzjddm" position="bottom">-->
+        <!--          <van-picker-->
+        <!--            show-toolbar-->
+        <!--            :columns="zjdDictionaries"-->
+        <!--            value-key="zjddm"-->
+        <!--            @confirm="onConfirmZjddm"-->
+        <!--            @cancel="showzjddm = false"-->
+        <!--          />-->
+        <!--        </van-popup>-->
+        <van-field
+          readonly
+          v-model="circulation.zjddm"
+          label="宅基地代码"
+          input-align="right"
+        >
+          <template #button>
+            <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
+          </template>
+        </van-field>
+        <field-select
+          readonly
+          v-model="circulation.xb"
+          label="性別"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择现状"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/open/zdzh/list/sys_user_sex"
+          :on-remote-response="'data'"
+        />
+
+        <van-field readonly v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field readonly v-model="circulation.lxdh" label="联系电话" placeholder="联系电话" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <field-select
+          readonly
+          v-model="circulation.gyqk"
+          label="共有情况"
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择共有情况"
+          :rules="[{ required: true }]"
+          required
+          remote-url="/open/zdzh/list/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <van-field readonly v-model="circulation.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      </div>
+              <div v-if="circulation.jtcyqkList">
+                <p class="main_title">家庭成员情况</p>
+
+                <div >
+                  <van-tabs v-if="circulation.jtcyqkList && circulation.jtcyqkList.length > 0" v-model="familyMembersActive" ref="memberTabs">
+                    <van-tab :title="(index + 1) + '. ' + item.xm" v-for="(item , index) in circulation.jtcyqkList" :key="index" swipeable>
+                      <div class="familyList">
+                        <div class="main_box" style="margin-bottom: 20px">
+<!--                          <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteFamily(index)" />-->
+                          <van-field readonly required v-model="item.xm" label="姓名" placeholder="姓名" input-align="right" :rules="[{ required: true }]"/>
+                          <van-field readonly required v-model="item.nl" label="年龄" placeholder="年龄" input-align="right" :rules="[{ required: true }]"/>
+                          <field-select
+                            v-model="item.yhzgx"
+                            readonly
+                            label="与户主关系"
+                            value-key="dictLabel"
+                            data-key="dictValue"
+                            placeholder="选择与户主关系"
+                            :rules="[{ required: true }]"
+                            required
+                            remote-url="/open/zdzh/list/family_status"
+                            :on-remote-response="'data'"
+                          />
+                          <van-field readonly required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/>
+                          <van-field readonly required v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                        </div>
+                      </div>
+                    </van-tab>
+                  </van-tabs>
+                </div>
+              </div>
+      <div v-if="circulation.gyrqkList">
+        <p class="main_title">共有人情况</p>
+
+        <div >
+          <van-tabs v-if="circulation.gyrqkList && circulation.gyrqkList.length > 0" v-model="familyMembersActive" ref="memberTabs">
+            <van-tab :title="(index + 1) + '. ' + item.xm" v-for="(item , index) in circulation.gyrqkList" :key="index" swipeable>
+              <div class="familyList">
+                <div class="main_box" style="margin-bottom: 20px">
+<!--                  <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteFamily(index)" />-->
+                  <van-field readonly required v-model="item.xm" label="姓名" placeholder="姓名" input-align="right" :rules="[{ required: true }]"/>
+                  <van-field readonly required v-model="item.nl" label="年龄" placeholder="年龄" input-align="right" :rules="[{ required: true }]"/>
+                  <field-select
+                    v-model="item.yhzgx"
+                    label="与户主关系"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    placeholder="选择与户主关系"
+                    :rules="[{ required: true }]"
+                    required
+                    readonly
+                    remote-url="/open/zdzh/list/family_status"
+                    :on-remote-response="'data'"
+                  />
+                  <van-field readonly required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/>
+                  <van-field readonly required v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                </div>
+              </div>
+            </van-tab>
+          </van-tabs>
+        </div>
+      </div>
+      <p class="main_title">拟申请退出宅基地</p>
+      <van-field readonly v-model="circulation.tcmj" label="面积(㎡)" placeholder="请输入面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <field-select
+        readonly
+        v-model="circulation.xz"
+        label="现状"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择现状"
+        :rules="[{ required: true }]"
+        required
+        remote-url="/open/zdzh/list/dsxz"
+        :on-remote-response="'data'"
+      />
+      <van-field readonly v-model="circulation.zjdszd" label="东至" placeholder="东至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field readonly v-model="circulation.zjdszn" label="南至" placeholder="南至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field  readonly v-model="circulation.zjdszx" label="西至" placeholder="西至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field readonly v-model="circulation.zjdszb" label="北至" placeholder="北至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        readonly
+        v-model="circulation.dldm"
+        label="地类"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择现状"
+        :rules="[{ required: true }]"
+        required
+        remote-url="/open/zdzh/list/geographic_type"
+        :on-remote-response="'data'"
+      />
+      <p class="main_title">退出宅基地情况</p>
+      <van-field readonly v-model="circulation.tcmj" label="退出面积(㎡)" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field readonly v-model="circulation.jzmj" label="建筑面积(㎡)" placeholder="请输入建筑面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          v-model="tcqllx"
+          label="退出权利类型"
+          placeholder="请选择退出权利类型"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtcqllx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tcqllxDictionaries"
+            @cancel="showtcqllx = false"
+          />
+        </van-popup>
+
+        <!--<van-field
+          readonly
+          clickable
+          v-model="tclx"
+          label="退出类型"
+          placeholder="请选择退出类型"
+          @click="showtclx = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtclx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tclxDictionaries"
+            @confirm="onConfirmTclx"
+            @cancel="showtclx = false"
+          />
+        </van-popup>-->
+
+        <van-field
+          readonly
+          clickable
+          v-model="tcfs"
+          label="退出方式"
+          placeholder="请选择退出方式"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto" :rules="[{ required: true }]" required
+        />
+        <van-popup v-model="showtcfs" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="tcfsDictionaries"
+            @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 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="/open/zdzh/list/yctcfs"
+        :on-remote-response="'data'"
+      />
+      <field-select
+        readonly
+        v-model="circulation.bcfs"
+        label="补偿方式"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="选择退出类型"
+        remote-url="/open/zdzh/list/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"/>
+      <field-date-picker
+        readonly
+        v-model="circulation.sqrq"
+        label="申请日期"
+        placeholder="选择日期"
+        :rules="[{ required: true }]"
+        formatter="yyyy-MM-dd"
+        required
+      />
+      <van-field readonly v-model="circulation.jbrxm" label="经办人姓名" placeholder="请输入经办人姓名" input-align="right" label-width="auto"/>
+      <field-date-picker
+        readonly
+        v-model="circulation.pzrq"
+        label="批准日期"
+        placeholder="选择日期"
+        :rules="[{ required: true }]"
+        formatter="yyyy-MM-dd"
+        required
+      />
+      <field-date-picker
+        v-model="circulation.barq"
+        label="备案日期"
+        placeholder="选择日期"
+        :rules="[{ required: true }]"
+        formatter="yyyy-MM-dd"
+        required
+      />
+
+      <van-dialog v-model="mapShow" show-cancel-button>
+        <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.sqrxm" :landStatus="landStatus" :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+      </van-dialog>
+      <!-- 3组附件 -->
+      <van-popup
+        v-model="attachmentVisible"
+        closeable
+        position="top"
+        :style="{ height: '61.8%' }"
+        :close-on-click-overlay="proposerStatus == 1"
+        :lazy-render="false"
+      >
+        <van-tabs type="card" style="padding-top: 1.35rem;" color="#1D6FE9" :lazy-render="false" v-model="attachmentActive" ref="attachmentDialog">
+          <van-tab title="退出附件" key="0">
+            <home-apply-upload-comp
+              :business-type="houseApplyUploadComp.businessType"
+              :house-apply-status="houseApplyUploadComp.homeApplyStatus"
+              :process-key="houseApplyUploadComp.processKey"
+              :proposer-id="houseApplyUploadComp.proposerId"
+              :table-name="houseApplyUploadComp.tableName"
+              :readonly="houseApplyUploadComp.readonly"
+              :userName="houseApplyUploadComp.createBy"
+              :full="houseApplyUploadComp.full"
+            >
+            </home-apply-upload-comp>
+          </van-tab>
+        </van-tabs>
+      </van-popup>
+      <!-- 审批 -->
+        <div class="main_box examine_box" v-if="showCjt">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">村集体<br/>经济组<br/>织或村<br/>民委员<br/>会意见</van-col>
+            <van-col span="19">
+              <van-field required :readonly="approval.type !== 'todo' || !cjtspOperation" v-model="circulation.cjzzscyj" rows="2" autosize type="textarea" placeholder="审核意见"/>
+              <van-cell title="负责人:"  :rules="[{ required: true }]">
+                <van-image
+                  v-if="circulation.cjzzscr !='' && circulation.cjzzscr !=null && circulation.cjzzscr.endsWith('png')"
+                  width="100"
+                  height="50"
+                  :src="$store.getters.baseRoutingUrl+circulation.cjzzscr"
+                ></van-image>
+                <div  v-if="circulation.cjzzscr !='' && circulation.cjzzscr !=null && !circulation.cjzzscr.endsWith('png')">{{circulation.cjzzscr}}</div>
+              </van-cell>
+              <field-date-picker
+                v-model="circulation.cjzzscsj"
+                label="审批日期"
+                placeholder="选择日期"
+                :readonly="approval.type !== 'todo' || !cjtspOperation"
+                :rules="[{ required: true }]"
+                formatter="yyyy-MM-dd"
+                required
+              />
+            </van-col>
+
+          </van-row>
+        </div>
+
+        <div class="main_box examine_box" v-if="showZjsp">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">镇级人<br/>民镇府<br/>意见</van-col>
+            <van-col span="19">
+              <van-field required :readonly="approval.type !== 'todo'" v-model="circulation.xzzfshpzyj" rows="2" autosize type="textarea" placeholder="审核意见"/>
+              <van-cell title="负责人:"  :rules="[{ required: true }]">
+                <van-image
+                  v-if="circulation.xzzfshpzrxm !='' && circulation.xzzfshpzrxm !=null && circulation.xzzfshpzrxm.endsWith('png')"
+                  width="100"
+                  height="50"
+                  :src="$store.getters.baseRoutingUrl+circulation.xzzfshpzrxm"
+                ></van-image>
+                <div v-if="circulation.xzzfshpzrxm !='' && circulation.xzzfshpzrxm !=null && !circulation.xzzfshpzrxm.endsWith('png')">{{circulation.xzzfshpzrxm}}</div>
+              </van-cell>
+              <field-date-picker
+                v-model="circulation.xzzfshpzsj"
+                label="审批日期"
+                placeholder="选择日期"
+                :rules="[{ required: true }]"
+                :readonly="approval.type !== 'todo'"
+                formatter="yyyy-MM-dd"
+                required
+              />
+            </van-col>
+
+          </van-row>
+        </div>
+      <div class="clear"></div>
+      <van-goods-action style="z-index: 999;">
+        <van-goods-action-icon icon="label-o" text="附件" @click="openAttachment" color="#1D6FE9" />
+        <van-goods-action-button type="info" text="同意" v-if="approval.type == 'todo'"  @click="complete(true)" />
+        <van-goods-action-button type="danger" text="驳回" v-if="approval.type == 'todo'"  @click="complete(false)"/>
+      </van-goods-action>
+    </div>
+</template>
+
+<script>
+  import {  getZyyctc,getShyqrs,zyyctcEdit,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
+  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import FieldDatePicker from "@/components/form/FieldDatePicker";
+  import {formatDate} from "element-ui/src/utils/date-util.js";
+  import { } from "@/api/onlineHome/homestead/paidExit";
+  import {Notify} from "vant";
+  import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
+import request from '@/utils/request';
+  const PROPOSER_VIEW = 1;
+  // 工作流名称
+  const PROPOSER_STAGE_BASE_APPLY_ACTIVITY = 'home_usetc';
+  // 附件表名
+  const PROPOSER_STAGE_BASE_APPLY_TABLE = 't_homeuse_zyyctc';
+  // 其他
+  const PROPOSER_MODULE = 'home';
+export default {
+  name: "paidExitDetailNew",
+  components: { MapGisObtainTc,FieldSelect,FieldDatePicker,HomeApplyUploadComp },
+  data() {
+    return {
+      tcqllxDictionaries:[],//退出权利类型
+      tclxDictionaries:[],//退出类型
+      tcfsDictionaries:[],//退出方式
+      xbDictionaries:[],//申请人证件类型
+      zjlxDictionaries:[],
+      bcfsDictionaries:[],//补偿方式
+      zjdDictionaries:[],//宅基地代码
+      getObligeeOptions:[],//下拉框列表
+      tcqllx:'',
+      tclx:'',
+      tcfs:'',
+      xb:'',
+      bcfs:'',
+      zjddm:'',
+      landStatus:"1",
+      nickName:this.$route.query.nickName,
+      electronicSignature:this.$route.query.electronicSignature,
+      showtcqllx: false,
+      showtclx: false,
+      showtcfs: false,
+      showxb: false,
+      showbcfs: false,
+      showzjddm: false,
+      showZjsp: false,
+      showCjt:false,
+      cjtspOperation:false,
+      showDropList: false,//是否显示下拉框
+      mapShow: false,
+      attachmentVisible:false,
+      // 家庭成员tab
+      familyMembersActive: 0,
+      active: 0,
+      // 表单意图
+      proposerStatus: PROPOSER_VIEW,
+      circulation:{},
+      // 当前附件tab
+      attachmentActive: 0,
+      // 申请附件树
+      houseApplyUploadComp: {
+        businessType: PROPOSER_MODULE,
+        proposerId: this.$route.query.id,
+        homeApplyStatus: "11",
+        processKey: PROPOSER_STAGE_BASE_APPLY_ACTIVITY,
+        tableName: PROPOSER_STAGE_BASE_APPLY_TABLE,
+        attachmentList: [],
+        readonly: true,
+        full: false,
+      },
+      approval: {
+        taskId: null,
+        instanceId: null,
+        type: null,
+        id: null,
+        comment: '',
+      },
+    };
+  },
+  created() {
+    this.approval.id = this.$route.query.id;
+    this.approval.auditbatchNo = this.$route.query.auditbatchNo;
+    this.approval.type = this.$route.query.type;
+    this.approval.taskId = this.$route.query.taskId;
+    this.getDetail();
+  },
+  methods: {
+    // 获取日期, yyyy-MM-dd
+    getDate(d) {
+      return formatDate(d ? d : new Date(), 'yyyy-MM-dd');
+    },
+    getDetail(){
+      getZyyctc(this.$route.query.id).then(response => {
+        this.circulation = response.data;
+        if(this.circulation.jtcyqkList != null){
+          for(let i = 0; i < this.circulation.jtcyqkList.length; i++)
+          {
+            this.updateMemberInfo(i);
+          }
+        }
+        if(this.circulation.gyrqkList != null){
+          for(let i = 0; i < this.circulation.gyrqkList.length; i++)
+          {
+            this.updateMemberInfoGy(i);
+          }
+        }
+        if(this.approval.type === "todo"){
+          console.info(response.data.auditStatus)
+          if(response.data.auditStatus === "1" || response.data.auditStatus === "2"){
+            if(this.electronicSignature != null){
+              this.$set(this.circulation, "cjzzscr", this.electronicSignature);
+            }else{
+              this.$set(this.circulation, "cjzzscr", this.nickName);
+            }
+            let handlerTime = this.getDate();
+            this.$set(this.circulation, "cjzzscsj", handlerTime);
+            this.cjtspOperation = true;
+            this.showCjt = true;
+
+          }else if(response.data.auditStatus === "3"){
+            this.showCjt = true;
+            if(this.electronicSignature != null){
+              this.zzfdzqmShow = true;
+              this.$set(this.circulation, "xzzfshpzrxm", this.electronicSignature);
+            }else{
+              this.$set(this.circulation, "xzzfshpzrxm", this.nickName);
+            }
+            let handlerTime = this.getDate();
+            this.$set(this.circulation, "xzzfshpzsj", handlerTime);
+          }else{
+            this.showCjt = true;
+            this.showZjsp = true;
+          }
+        }else{
+          if(response.data.auditStatus === "4" ){
+            this.showCjt = true;
+            this.showZjsp = true;
+          }else if(response.data.auditStatus === "0" || response.data.auditStatus === "1"){
+            this.showCjt = false;
+          }else{
+            this.showCjt = true;
+          }
+        }
+
+        //退出权利类型
+        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("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("audit_status").then((res) => {
+        //   this.circulation.auditStatus = this.selectDictLabel(res.data, response.data.auditStatus);
+        // });
+      });
+    },
+    parseIDCard(idcard) {
+      if(!idcard)
+        return false;
+      if(idcard.length !== 18)
+        return false;
+      if(!/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(idcard))
+        return false;
+      let sex = (parseInt(idcard.substr(16, 1)) % 2) ^ 1;
+      let now = new Date().getFullYear();
+      let y = parseInt(idcard.substr(6, 4));
+      let age = Math.max(now - y, 0);
+      return [sex, age];
+    },
+    updateMemberInfo(index) {
+      let res = this.parseIDCard(this.circulation.jtcyqkList[index].sfzh);
+      if(res)
+      {
+        this.$set(this.circulation.jtcyqkList[index], 'nl', res[1]);
+      }
+    },
+    updateMemberInfoGy(index) {
+      let res = this.parseIDCard(this.circulation.gyrqkList[index].sfzh);
+      if(res)
+      {
+        this.$set(this.circulation.gyrqkList[index], 'nl', res[1]);
+      }
+    },
+    remoteProposerMethod() {
+      this.showzjddm = true;
+      this.zjdDictionaries = [];
+      if (this.circulation.sqrxm) {
+        getShyqrs({shyqrdbxm:this.circulation.sqrxm}).then(response => {
+          this.zjdDictionaries = response.data.map(item => {
+            return {
+              zjddm: item.zjddm,
+              shyqrdbxm: item.shyqrdbxm,
+              shyqrdbzjlx: item.shyqrdbzjlx,
+              shyqrdbzjhm: item.shyqrdbzjhm
+            }
+          });
+        });
+      } else {
+        this.zjdDictionaries = [];
+      }
+    },
+    /** 模糊查询人员信息 */
+    remoteTransfereeMethod(query) {
+      if (query !== "") {
+        getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
+          if (response.code == 200) {
+            this.getObligeeOptions = response.rows.map(function (item) {
+              return {
+                sqrxm:item.shyqrdbxm,
+                sqrxb:item.xb,
+                sqrzjhm:item.shyqrdbzjhm,
+                sqrzjlx:item.shyqrdbzjlx,
+                sqrdh:item.dh,
+                gyfs:item.gyfs,
+                dz:item.dz,
+                deptId:item.deptId,
+                deptName:item.deptName,
+              }
+            })
+            //设置模糊查询的下拉框和滚动条
+            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;
+      }
+    },
+    shyqrdmxmChange(val){
+      console.info(val);
+      this.$set(this.circulation, "sqrxm", val.sqrxm);
+      this.$set(this.circulation, "deptId", val.deptId);
+      this.$set(this.circulation, "deptName", val.deptId);
+      this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
+      this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+      this.$set(this.circulation, "gyqk", val.gyfs);
+      this.$set(this.circulation, "xb", val.sqrxb);
+      this.$set(this.circulation, "lxdh", val.sqrdh);
+      this.$set(this.circulation, "hkszd", val.dz);
+      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((response) => {
+          response.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));
+          });
+        });
+        // const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if(response.rows[0].zdt != null && response.rows[0].zdt !== ""){
+          this.$set(this.form, "xzzp", response.rows[0].zdt);
+        }
+      });
+    },
+    mapLook(){
+      this.mapShow = true;
+      setTimeout(() => {
+        this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+      },1000);
+    },
+    // 打开附件树
+    openAttachment() {
+      this.attachmentVisible = true;
+      if(this.attachmentActive == this.active)
+        this.$nextTick(() => {
+          this.$refs.attachmentDialog.scrollTo(this.active);
+        });
+    },
+    complete(pass) {
+      if(this.circulation.auditStatus === "1" || this.circulation.auditStatus === "3"){
+        this.approval.comment = this.circulation.cjzzscyj;
+      }else{
+        this.approval.comment = this.circulation.xzzfshpzyj;
+      }
+      if(!this.approval.taskId || !this.approval.auditbatchNo || this.approval.type !== 'todo')
+      {
+        console.error("无效操作");
+        return false;
+      }
+      if(!this.approval.comment)
+      {
+        this.notify("请填写审批意见", 'danger');
+        return false;
+      }
+      /*let data = {
+        taskId: this.approval.taskId,
+        instanceId: this.approval.instanceId,
+        variables: JSON.stringify({
+          pass: pass ? "true" : "false",
+          comment: this.approval.comment ? this.approval.comment : (pass ? '同意' : '驳回'),
+        }),
+      };
+      request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        this.notify("操作成功", 'success');
+        this.$router.back();
+      }).catch(e => {
+        this.notify("操作失败!", 'danger');
+      });*/
+      if (pass) {
+        let data = {
+          taskId: this.approval.taskId,
+          auditbatchNo:this.approval.auditbatchNo,
+          pass: pass ? "true" : "false",
+          remark:this.approval.comment ? this.approval.comment : "同意",
+        };
+        zyyctcEdit(this.circulation).then(response => {
+          request({
+            url: "/approval/audit/audit",
+            method: "post",
+            data: data,
+          }).then((response) => {
+            this.notify("操作成功", 'success');
+            this.$router.back();
+          }).catch(e => {
+            this.notify("操作失败!", 'danger');
+          });
+        });
+
+      } else {
+        let _this = this;
+        _this.$dialog.confirm({
+          message: '是否确认驳回此条申请',
+        }).then(() => {
+          let data = {
+            taskId: this.approval.taskId,
+            auditbatchNo:this.approval.auditbatchNo,
+            pass: pass ? "true" : "false",
+            remark:this.approval.comment ? this.approval.comment : "驳回",
+          };
+          zyyctcEdit(this.circulation).then(response => {
+            request({
+              url: "/approval/audit/audit",
+              method: "post",
+              data: data,
+            }).then((response) => {
+              _this.notify("操作成功", 'success');
+              _this.$router.back();
+            }).catch(e => {
+              _this.notify("操作失败!", 'danger');
+            });
+          });
+        });
+      }
+      return true;
+    },
+    notify(message, type) {
+      Notify.clear();
+      Notify({ type: type || 'primary', message: message });
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding-bottom: 2%;
+    .header_main{
+      height: 116px;
+      background: url('../../../assets/images/sunVillage_info/list_head_green.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;
+      margin-bottom: 2%;
+      .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;
+      }
+    }
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+
+  }
+  .clear{
+    height: 80px;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+    .van-col:first-child{
+      color: #FFF!important;
+      font-size: 0.45rem!important;
+      text-align: center!important;
+    }
+    .van-col:last-child{
+      background-color: #FFF!important;
+      border-radius: 0.15rem!important;
+      overflow: hidden!important;
+      .van-radio-group--horizontal{
+        padding: 0.2rem 0;
+        border-bottom: 1px solid #eee;
+      }
+    }
+  }
+</style>

src/views/sunVillage_info/paidExit/paidExitNewList.vue

@@ -0,0 +1,234 @@
+<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>-->
+
+      <div class="header_main">
+        有偿退出
+        <div class="return_btn" @click="onClickLeft"></div>
+        <div class="add_btn" @click="goAdd"></div>
+      </div>
+
+      <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="selectDictLabel(auditStatus, item.auditStatus)" center :to="{name:'sunVillageInfoPaidExitDetail', query: {id:item.id}}" >
+            <template #icon>
+              <van-icon name="../../../static/images/onlineHome/icon_zjd3.png" size="30" color="#539FFD" style="margin-right: 10px;" />
+            </template>
+            <template #label>
+              <p><b style="color: #539FFD;">{{item.tcfs}}</b><i style="margin-right: 0.5rem;"></i><b style="color: #333333;">{{item.sqrxm}}</b><i style="margin-right: 0.5rem;"></i>{{item.tcmj}}㎡</p>
+            </template>
+          </van-cell>
+          <template #right>
+            <van-row>
+              <van-col>
+                <van-button square text="修改" v-if="item.auditStatus=='0' || item.auditStatus=='5'" :to="{name:'sunVillageInfoPaidExitModify', query: {id:item.id}}" type="info" class="delete-button" />
+              </van-col>
+              <van-col>
+                <van-button square text="提交" type="primary" v-if="item.auditStatus=='0' || item.auditStatus=='5'" class="delete-button" @click="goSubmit(item)" />
+              </van-col>
+              <van-col>
+                <van-button square text="删除" v-if="item.auditStatus=='0' || item.auditStatus=='5'" @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, zyyctcApplyNew } from "@/api/sunVillage_info/homestead/paidExit";
+import {A_start} from "@/api/audit/aauditpipeline";
+import {A_listAuditModel} from "@/api/audit/aauditmodel";
+import Cookies from "js-cookie";
+export default {
+  name: "paidExit",
+  data() {
+    return {
+      applicationList:[],
+      houseApplyStatus:[],
+      tcqllxStatus:[],
+      tclxStatus:[],
+      tcfsStatus:[],
+      auditStatus:[],
+      loading: false,
+      finished: false,
+      idcard:null,
+      queryParams:{
+        pageNum:1,
+        pageSize:10,
+        deptId: Cookies.get('deptId'),
+        orderByColumn:'createTime',
+        isAsc:'desc',
+        // 申请类型  1-宅基地退出
+        sqlx: '1',
+        // 退出类型  01-有偿退出   02-无偿退出
+        tclx: '01',
+      }
+    };
+  },
+  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;
+    });
+    let user =  JSON.parse(Cookies.get('user'));
+    this.$set(this.queryParams, "sqrzjhm", user.idcard);
+    this.houseGetDicts("yctcsp_status").then((res) => {
+      // this.auditStatus = res.data;
+      let _this = this;
+      res.data.forEach((item) => {
+          _this.auditStatus.push(item);
+      });
+    });
+  },
+  methods: {
+    goAdd(){
+      window.location = '/sunVillage_info/paidExitAdd';
+    },
+    getList(){
+      setTimeout(() => {
+        getList(this.queryParams).then(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)
+            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);
+    },
+    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(item) {
+      zyyctcApplyNew(item.id).then(response => {
+        if (response.code = 200) {
+          this.$toast.success('提交成功');
+          setTimeout(function () {
+            window.location.replace("/sunVillage_info/paidExit/paidExitList")
+          }, 1000)
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    .header_main{
+      height: 116px;
+      background: url('../../../assets/images/sunVillage_info/list_head_green.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;
+      }
+    }
+  }
+  /deep/.van-list{
+    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;
+    text-align: center;
+    position: relative;
+    left: 20px;
+  }
+  /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>

src/views/yinnong/doneCompleted/completedNew.vue

@@ -0,0 +1,177 @@
+<template>
+  <div>
+    <van-nav-bar
+      title="待办事项"
+    />
+    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:128px;border-radius: 6px;">
+      <van-swipe-item v-for="(image,index) in images" :key="index">
+        <img :src="image" style="width:100%;height: 128px"/>
+      </van-swipe-item>
+    </van-swipe>
+    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell>
+        <template #title>
+          <van-row style="">
+            <van-col span="23" :offset="1">
+
+              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+                <van-image
+                  height="20"
+                  width="20"
+                  style="vertical-align: middle;margin-right: 10px"
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</h3>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+      <van-cell>
+        <template #title>
+          <van-row>
+            <van-col span="6" :offset="1">
+              <p style="color: #878787" >{{item.data.createTime?item.data.createTime.substring(0,10):item.data.startTime.substring(0,10)}}</p>
+            </van-col>
+            <van-col span="10" :offset="1">
+              <p style="color: #878787">{{item.data.businessType}}</p>
+            </van-col>
+            <van-col span="5" :offset="1">
+              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-cell-group>
+    <van-empty v-if="taskList.length<1" description="暂无事项" />
+    <yinnongIndex></yinnongIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../../onlineHomeIndex";
+    import yinnongIndex from "../../yinnongIndex";
+    import { getInfo } from "../../../api/login/index";
+    import {A_myTodoList} from "../../../api/audit/aauditpipeline";
+
+    export default {
+      components: {
+        onlineHomeIndex,
+        yinnongIndex
+      },
+        name: "done",
+      data(){
+        return{
+          taskList:[],
+          activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
+          total:0,
+          nickName:"",
+          electronicSignature:"",
+          queryParams: {
+            pageNum: 1,
+            pageSize: 100,
+          },
+          activityBusinessTypeOptions:[],
+          images:['../../../../static/images/onlineHome/banner_03.png'],
+        }
+      },
+      created() {
+        this.getDicts("activity_business_type").then((response) => {
+          this.activityBusinessTypeOptions = response.data;
+          if(this.$route.query.activeName){
+            this.activeName = this.$route.query.activeName
+          }
+          this.getList();
+        });
+        console.log(this.$route.query.fr)
+        if(this.$route.query.fr){
+          this.$cookies.set("from",this.$route.query.fr,"0")
+        }
+        getInfo().then((response) => {
+            this.electronicSignature = response.user.electronicSignature;
+            this.nickName = response.user.nickName;
+        });
+      },
+      methods: {
+        goOnlineHomeIndex(){
+          if(this.$cookies.get("from")=="my"){
+            this.$router.push({name:"yinnongMy"})
+          }else{
+            this.$router.push({name:"yinnongWorkbench"})
+          }
+        },
+        getList() {
+          this.taskList = []
+          // this.$set(this.queryParams, "systemType", '4');
+          A_myTodoList(this.queryParams).then((response) => {
+            response.rows.map(res => {
+              if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                res.tableName = '来自农村宅基地管理系统'
+              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }
+
+              if(this.activityBusinessTypeOptions){
+                this.activityBusinessTypeOptions.map(t => {
+                  if(t.dictValue === res.businessType){
+                    res.businessType = t.dictLabel
+                    this.taskList.push(res)
+                  }
+                });
+              }
+            })
+          })
+        },
+        goDetail(item){
+          console.log(item)
+          let type = item.tableName;
+          switch (type) {
+            case 't_homeuse_zyyctc':
+              this.$router.push({name:'sunVillageInfoPaidExitDetailNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo",electronicSignature:this.electronicSignature,nickName:this.nickName}})
+              break;
+            case 't_homeapply_ydjfys':
+            case 't_homeapply_ydjfkg':
+              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.ydjfsqId,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo",electronicSignature:this.electronicSignature,nickName:this.nickName}})
+              break;
+            case 't_homeapply_ydjfsq':
+              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo",electronicSignature:this.electronicSignature,nickName:this.nickName}})
+              break;
+            case 'baseApply':
+            case 'landscope':
+            case 'accepting':
+              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
+            case 'toReviewTransferProcess':
+            case 'yinnong_transfer':
+              if(item.formData.transferType == '10'){
+                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '11'){
+                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '12'){
+                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
+                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+            case 'yinnong_majorevent':
+              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+          }
+        }
+      },
+    }
+</script>
+
+<style scoped>
+  >>>.my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20px;
+    line-height: 144px;
+    text-align: center;
+  }
+</style>

src/views/yinnong/doneCompleted/done.vue

@@ -1,4 +1,4 @@
-<template>
+done.vue<template>
   <div>
     <van-nav-bar
       title="已办事项"

src/views/yinnong/doneCompleted/doneNew.vue

@@ -0,0 +1,170 @@
+done.vue<template>
+  <div>
+    <van-nav-bar
+      title="已办事项"
+    />
+    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:128px;border-radius: 6px;">
+      <van-swipe-item v-for="(image,index) in images" :key="index">
+        <img :src="image" style="width:100%;height: 128px"/>
+      </van-swipe-item>
+    </van-swipe>
+    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell>
+        <template #title>
+          <van-row style="">
+            <van-col span="23" :offset="1">
+
+              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+                <van-image
+                  height="20"
+                  width="20"
+                  style="vertical-align: middle;margin-right: 10px"
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</h3>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+      <van-cell>
+        <template #title>
+          <van-row>
+            <van-col span="6" :offset="1">
+              <p style="color: #878787">{{item.data.createTime?item.data.createTime.substring(0,10):item.data.startTime.substring(0,10)}}</p>
+            </van-col>
+            <van-col span="10" :offset="1">
+              <p style="color: #878787">{{item.businessType}}</p>
+            </van-col>
+            <van-col span="5" :offset="1">
+              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
+            </van-col>
+          </van-row>
+        </template>
+      </van-cell>
+    </van-cell-group>
+    <van-empty v-if="taskList.length<1" description="暂无事项" />
+    <yinnongIndex></yinnongIndex>
+  </div>
+</template>
+
+<script>
+    import onlineHomeIndex from "../../onlineHomeIndex";
+    import yinnongIndex from "../../yinnongIndex";
+    import {A_myDoneList} from "../../../api/audit/aauditpipeline";
+
+    export default {
+      components: {
+        onlineHomeIndex,
+        yinnongIndex
+      },
+        name: "done",
+      data(){
+        return{
+          taskList:[],
+          activeName:this.$route.query.activeName?this.$route.query.activeName:'2',
+          total:0,
+          queryParams: {
+            pageNum: 1,
+            pageSize: 100,
+          },
+          activityBusinessTypeOptions:[],
+          images:['../../../../static/images/onlineHome/banner_02.png'],
+        }
+      },
+      created() {
+        this.getDicts("activity_business_type").then((response) => {
+          this.activityBusinessTypeOptions = response.data;
+          if(this.$route.query.activeName){
+            this.activeName = this.$route.query.activeName
+          }
+          this.getList();
+        });
+        console.log(this.$route.query.fr)
+        if(this.$route.query.fr){
+          this.$cookies.set("from",this.$route.query.fr,"0")
+        }
+
+      },
+      methods: {
+        goOnlineHomeIndex(){
+          if(this.$cookies.get("from")=="my"){
+            this.$router.push({name:"yinnongMy"})
+          }else{
+            this.$router.push({name:"yinnongWorkbench"})
+          }
+        },
+        getList() {
+          this.taskList = []
+          // this.$set(this.queryParams, "systemType", '4');
+          A_myDoneList(this.queryParams).then((response) => {
+            response.rows.map(res => {
+              if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                res.tableName = '来自农村宅基地管理系统'
+              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                res.tableName = '来自银农直联审批管理系统'
+              }
+              if(this.activityBusinessTypeOptions){
+                this.activityBusinessTypeOptions.map(t => {
+                  if(t.dictValue == res.businessType){
+                    res.businessType = t.dictLabel
+                    this.taskList.push(res)
+                  }
+                });
+              }
+            })
+          })
+        },
+        goDetail(item){
+          console.log(item)
+          let type = item.tableName;
+          switch (type) {
+            case 't_homeuse_zyyctc':
+              this.$router.push({name:'sunVillageInfoPaidExitDetailNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done",electronicSignature:this.electronicSignature,nickName:this.nickName}})
+              break;
+            case 'home_check':
+            case 'home_start':
+              this.$router.push({name:'approvalForm',query: {id:item.formData.ydjfsqId,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
+            case 't_homeapply_ydjfsq':
+              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchN,type:"done"}})
+              break;
+            case 'baseApply':
+            case 'landscope':
+            case 'accepting':
+              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
+            case 'toReviewTransferProcess':
+            case 'yinnong_transfer':
+              if(item.formData.transferType == '10'){
+                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '11'){
+                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType == '12'){
+                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
+                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
+              }
+            case 'yinnong_majorevent':
+              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              break;
+          }
+        }
+      },
+    }
+</script>
+
+<style scoped>
+  >>>.my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20px;
+    line-height: 144px;
+    text-align: center;
+  }
+</style>

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

@@ -0,0 +1,265 @@
+<template>
+  <div class="app-container">
+    <div class="header_main">
+      有偿使用超期
+      <div class="return_btn" @click="onClickLeft"></div>
+<!--      <div class="add_btn" @click="goAdd"></div>-->
+    </div>
+    <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>
+          <span>{{item.ycsyfy}}元</span>
+          <template #label>
+            <p><b style="color: #539FFD;">{{item.sqrzjhm}}</b><i style="margin-right: 0.5rem;"></i></p>
+          </template>
+
+        </van-cell>
+                  <template #right>
+                    <van-row>
+<!--                      <van-col>-->
+<!--                        <van-button square text="生成收费计划" v-if="item.syStatus == '1' && item.isDetail == '0'" @click="generateFeePlanClick(item)" type="info" class="add_btn" />-->
+<!--                      </van-col>-->
+                      <van-col>
+                        <van-button square text="收费计划" v-if="item.syStatus == '1' && item.isDetail == '1'"  @click="handleSfjh(item)" type="info" class="delete-button" />
+                      </van-col>
+<!--                      <van-col>-->
+<!--                        <van-button square text="终止" v-if="item.syStatus == '1'"   @click="handleTermination(item)" type="danger" class="delete-button" />-->
+<!--                      </van-col>-->
+<!--                      <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>
+    <van-dialog v-model="showSfjh" title="收费计划"  show-cancel-button :show-confirm-button="false"   cancelButtonText="关闭" @cancel="showSfjh = false" >
+      <div style="background:#fff;padding:10px 2.5%;display: flex;justify-content: space-between;">
+        <van-button type="primary" style="width:150px;height: 30px;font-size: 12px;" round @click="cxscsfjhClick">重新生成收费计划</van-button>
+      </div>
+      <paidUtilizeFeeplanList :ycsyId="ycsyId"  style="height: 600px;overflow: auto;"  ref="sfjh"/>
+    </van-dialog>
+  </div>
+</template>
+
+<script>
+  import { getYcsy,ycsyEdit,removeList,generateFeePlan,overdueList } from "@/api/onlineHome/homestead/paidUtilize";
+  import paidUtilizeFeeplanList from "@/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList";
+  import {getGeoServerConfigKey} from "@/api/system/config";
+  export default {
+    name: "paidUtilizeCqList",
+    components: {paidUtilizeFeeplanList},
+    data() {
+      return {
+        applicationList:[],
+        houseApplyStatus:[],
+        tcqllxStatus:[],
+        tclxStatus:[],
+        tcfsStatus:[],
+        auditStatus:[],
+        loading: false,
+        finished: false,
+        showSfjh:false,
+        ycsyId:null,
+        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';
+      },
+      cxscsfjhClick(){
+        let _this = this;
+        this.$dialog.confirm({
+          message: '是否重新生成收费计划？',
+        })
+          .then(() => {
+            // on confirm
+            getYcsy(_this.ycsyId).then(response => {
+              generateFeePlan(response.data).then((response) => {
+                if(response.code != 200) throw response.msg;
+                this.$toast.success("收费计划已生成");
+                _this.getList();
+              });
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
+      getList(){
+        setTimeout(() => {
+          overdueList(this.queryParams).then(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.finished = false;
+              this.queryParams.pageNum += 1 ;
+            }
+          });
+        }, 1000);
+      },
+      /** 生成收费计划 */
+      generateFeePlanClick(row){
+        generateFeePlan(row).then((response) => {
+          this.$toast.success("收费计划已生成");
+          this.getList();
+        });
+      },
+      /** 收费计划信息 */
+      handleSfjh(row){
+        this.title = "收费计划";
+        const id = row.id;
+        this.ycsyId = id;
+        this.showSfjh = true;
+      },
+      /** 终止 */
+      handleTermination(row){
+        let _this = this;
+        let data = row;
+        this.$dialog.confirm({
+          message: '是否确认终止此条有偿使用数据？',
+        }).then(function() {
+          _this.loading = true;
+          if(row.syStatus === "1"){
+            _this.$set(data, "syStatus",  "3");
+          }else{
+            _this.$set(data, "syStatus",  "1");
+          }
+          ycsyEdit(data).then(response => {
+            _this.$toast.success("操作成功");
+            _this.loading = false;
+            _this.getList();
+          });
+        });
+
+      },
+      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">
+  .app-container {
+  .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;
+  }
+  }
+  }
+  /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>

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

@@ -7,7 +7,7 @@
     <div class="main_box">
       <van-field
         readonly
-        v-model="circulation.shyqrdm"
+        v-model="circulation.shyqrdbxm"
         label="使用权人"
         input-align="right"
       />
@@ -51,7 +51,8 @@
         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>
+        {{circulation.sqrxm}}
+        <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm" :landStatus="landStatus" :deptId="circulation.deptId" ></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"/>

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

@@ -17,31 +17,51 @@
             <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
           </template>
           <span>{{item.ycsyfy}}元</span>
+          <br/>
+          <span v-if="item.syStatus == '1'" style="color:black;font-weight:  500;">正常</span>
+          <span v-if="item.syStatus == '3'" style="color: red;">终止</span>
           <template #label>
             <p><b style="color: #539FFD;">{{item.sqrzjhm}}</b><i style="margin-right: 0.5rem;"></i></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>
+        <template #right>
+          <van-row>
+            <van-col>
+              <van-button square text="生成收费计划" v-if="item.syStatus == '1' && item.isDetail == '0'" @click="generateFeePlanClick(item)" type="info" class="add_btn" />
+            </van-col>
+            <van-col>
+              <van-button square text="收费计划" v-if="item.syStatus == '1' && item.isDetail == '1'"  @click="handleSfjh(item)" type="info" class="delete-button" />
+            </van-col>
+            <van-col>
+              <van-button square text="终止" v-if="item.syStatus == '1'"   @click="handleTermination(item)" type="danger" class="delete-button" />
+            </van-col>
+            <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>
+    <van-dialog v-model="showSfjh" title="收费计划"  show-cancel-button :show-confirm-button="false"   cancelButtonText="关闭" @cancel="showSfjh = false" >
+      <div style="background:#fff;padding:10px 2.5%;display: flex;justify-content: space-between;">
+        <van-button type="primary" style="width:150px;height: 30px;font-size: 12px;" round @click="cxscsfjhClick">重新生成收费计划</van-button>
+      </div>
+      <paidUtilizeFeeplanList :ycsyId="ycsyId"  style="height: 600px;overflow: auto;"  ref="sfjh"/>
+    </van-dialog>
   </div>
 </template>
 
 <script>
-  import { getList , removeList  } from "@/api/onlineHome/homestead/paidUtilize";
+  import { getList , getYcsy,ycsyEdit,removeList,generateFeePlan  } from "@/api/onlineHome/homestead/paidUtilize";
+  import paidUtilizeFeeplanList from "@/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList";
   import {getGeoServerConfigKey} from "@/api/system/config";
   export default {
     name: "paidUtilizeList",
+    components: {paidUtilizeFeeplanList},
     data() {
       return {
         applicationList:[],
@@ -52,6 +72,8 @@
         auditStatus:[],
         loading: false,
         finished: false,
+        showSfjh:false,
+        ycsyId:null,
         queryParams:{
           pageNum:1,
           pageSize:10,
@@ -80,6 +102,25 @@
       goAdd(){
         window.location = 'paidUtilizeAdd';
       },
+      cxscsfjhClick(){
+        let _this = this;
+        this.$dialog.confirm({
+          message: '是否重新生成收费计划？',
+        })
+          .then(() => {
+            // on confirm
+            getYcsy(_this.ycsyId).then(response => {
+              generateFeePlan(response.data).then((response) => {
+                if(response.code != 200) throw response.msg;
+                this.$toast.success("收费计划已生成");
+                _this.$refs.sfjh.getList();
+              });
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
       getList(){
         setTimeout(() => {
           getList(this.queryParams).then(response => {
@@ -97,11 +138,47 @@
               return;
             }else{
               this.loading = false;
+              this.finished = false;
               this.queryParams.pageNum += 1 ;
             }
           });
         }, 1000);
       },
+      /** 生成收费计划 */
+      generateFeePlanClick(row){
+        generateFeePlan(row).then((response) => {
+          this.$toast.success("收费计划已生成");
+          this.getList();
+        });
+      },
+      /** 收费计划信息 */
+      handleSfjh(row){
+        this.title = "收费计划";
+        const id = row.id;
+        this.ycsyId = id;
+        this.showSfjh = true;
+      },
+      /** 终止 */
+      handleTermination(row){
+        let _this = this;
+        let data = row;
+        this.$dialog.confirm({
+          message: '是否确认终止此条有偿使用数据？',
+        }).then(function() {
+          _this.loading = true;
+          if(row.syStatus === "1"){
+            _this.$set(data, "syStatus",  "3");
+          }else{
+            _this.$set(data, "syStatus",  "1");
+          }
+          ycsyEdit(data).then(response => {
+            _this.$toast.success("操作成功");
+            _this.loading = false;
+            _this.getList();
+          });
+        });
+
+      },
       deleteList(id,index){
         this.$dialog.confirm({
           message: '您确认删除申请草稿？',

src/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanDteail.vue

@@ -0,0 +1,239 @@
+<template>
+  <div class="app-container">
+    <div class="header_main">
+      收费计划详情
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="main_box">
+      <van-field
+        readonly
+        v-model="circulation.shyqrdm"
+        label="使用权人代码"
+        input-align="right"
+      />
+      <van-field
+        readonly
+        v-model="circulation.shyqrdbxm"
+        label="使用权人姓名"
+        input-align="right"
+      />
+      <field-select
+        v-model="circulation.sqrzjlx"
+        label="证件类型"
+        value-key="dictLabel"
+        data-key="dictValue"
+        placeholder="请输入证件类型"
+        remote-url="/open/zdzh/list/zjlx"
+        :on-remote-response="'data'"
+        :rules="[{ required: true }]"
+        readonly
+      />
+      <van-field readonly v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="证件号码" input-align="right" label-width="auto"/>
+      <van-field
+        readonly
+        v-model="circulation.synd"
+        label="使用年度"
+        input-align="right"
+      />
+
+      <van-field readonly v-model="circulation.jfje" label="应缴费金额(元)" placeholder="请输入应缴费金额㎡" input-align="right" label-width="auto"/>
+      <FieldRadio
+        v-model="circulation.isJf"
+        label="是否缴费"
+        value-key="dictLabel"
+        data-key="dictValue"
+        remote-url="/open/zdzh/list/house_yes_no"
+        :on-remote-response="'data'"
+        readonly
+      />
+      <van-field
+        readonly
+        v-model="circulation.jfrq"
+        label="实缴费日期"
+        input-align="right"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import {getYcsysfmx} from "@/api/onlineHome/homestead/ycsysfmx";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import FieldRadio from "@/components/form/FieldRadio";
+  import $ from "jquery";
+  export default {
+    name: "paidUtilizeFeeplanDteail",
+    components: {FieldSelect, FieldRadio},
+    data() {
+      return {
+        tcqllxDictionaries:[],//退出权利类型
+        tclxDictionaries:[],//退出类型
+        tcfsDictionaries:[],//退出方式
+        zjlxDictionaries:[],//申请人证件类型
+        bcfsDictionaries:[],//补偿方式
+        zjdDictionaries:[],//宅基地代码
+        shyqrdmDictionaries:[],//使用权人
+        landStatus:"1",
+        tcqllx:'',
+        tclx:'',
+        tcfs:'',
+        zjlx:'',
+        bcfs:'',
+        zjddm:'',
+
+        showtcqllx: false,
+        showtclx: false,
+        showtcfs: false,
+        showzjlx: false,
+        showbcfs: false,
+        showzjddm: false,
+        showshyqrdm: false,
+        showycsykssj: false,
+        showycsydqsj: false,
+
+        circulation:{},
+        mapShow: false,
+      };
+    },
+    created() {
+      this.getDictionaries();
+    },
+    methods: {
+      getDictionaries(){
+        getYcsysfmx(this.$route.query.id).then(response => {
+          this.circulation = response.data;
+        });
+      },
+      /** 查找地图中定位点 */
+      MapTag: function (data) {
+        //this.form.theGeom = data;
+      },
+      onConfirmZjddm(data){
+        console.log(data)
+        this.circulation.zjddm = data;
+        this.showzjddm = false;
+      },
+      onConfirmZjlx(data){
+        this.zjlx = data.text;
+        this.circulation.sqrzjlx = data.value;
+        this.showzjlx = false;
+      },
+      onConfirmTcqllx(data){
+        this.tcqllx = data.text;
+        this.circulation.tcqllx = data.value;
+        this.showtcqllx = false;
+      },
+      onConfirmTclx(data){
+        this.tclx = data.text;
+        this.circulation.tclx = data.value;
+        this.showtclx = false;
+      },
+      onConfirmTcfs(data){
+        this.tcfs = data.text;
+        this.circulation.tcfs = data.value;
+        this.showtcfs = false;
+      },
+      onConfirmBcfs(data){
+        this.bcfs = data.text;
+        this.circulation.bcfs = data.value;
+        this.showbcfs = false;
+      },
+      onConfirmShyqrdm(data){
+        this.circulation.shyqrdm = data;
+        this.showshyqrdm = false;
+      },
+      onConfirmYcsykssj(data){
+        this.circulation.ycsykssj = this.getNowFormatDate(data).substr(0,10);
+        this.showycsykssj = false;
+      },
+      onConfirmYcsydqsj(data){
+        this.circulation.ycsydqsj = this.getNowFormatDate(data).substr(0,10);
+        this.showycsydqsj = false;
+      },
+      goEdit(){
+        window.location.replace("paidUtilizeList")
+      },
+      goSubmit(){
+        ycsyEdit(this.circulation).then(response => {
+          if(response.code = 200){
+            this.$toast.success('修改成功');
+            setTimeout(function(){
+              window.location.replace("paidUtilizeList")
+            },1000)
+          }
+        });
+      },
+      mapLook(){
+        this.mapShow =true;
+        setTimeout(() => {
+          this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+        },1000)
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+  .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;
+  }
+  }
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+
+  }
+  .mapBox{
+    position: relative;
+  .mapBox_button{
+    position: absolute;
+    top: 0.2rem;
+    right: 2%;
+  }
+  }
+</style>

src/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList.vue

@@ -0,0 +1,244 @@
+<template>
+  <div class="app-container">
+    <div class="header_main" v-if="showTitle">
+      收费计划
+      <div class="return_btn" @click="onClickLeft"></div>
+<!--      <div class="add_btn" @click="goAdd"></div>-->
+    </div>
+    <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:'paidUtilizeFeeplanDteail', query: {id:item.id}}" >
+          <template #icon>
+            <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
+          </template>
+          <span>{{item.jfje}}元</span>
+          <br/>
+          <span v-if="item.isJf == '0'" style="color: #d7be6e;">未缴费</span>
+          <span v-if="item.isJf == '1'" style="color:#1b9000;">已缴费</span>
+          <span></span>
+          <template #label>
+            <p><b style="color: #539FFD;">{{item.jzrq}}</b><i style="margin-right: 0.5rem;"></i></p>
+          </template>
+
+        </van-cell>
+        <template #right>
+          <van-row>
+            <van-col>
+              <van-button square text="缴费" v-if="item.isJf == '0'" @click="handlePay(item)" type="info" class="delete-button" />
+            </van-col>
+          </van-row>
+        </template>
+      </van-swipe-cell>
+    </van-list>
+  </div>
+</template>
+
+<script>
+  import {generateFeePlan  } from "@/api/onlineHome/homestead/paidUtilize";
+  import {listYcsysfmx,updateYcsysfmx } from "@/api/onlineHome/homestead/ycsysfmx";
+  import wcnhList from "@/views/homesteadSurvey/wcnhList";
+  import {getGeoServerConfigKey} from "@/api/system/config";
+  export default {
+    name: "paidUtilizeList",
+    props: ["ycsyId"],
+    data() {
+      return {
+        applicationList:[],
+        houseApplyStatus:[],
+        tcqllxStatus:[],
+        tclxStatus:[],
+        tcfsStatus:[],
+        auditStatus:[],
+        showTitle:false,
+        loading: false,
+        finished: false,
+        showSfjh:false,
+        queryParams:{
+          pageNum:1,
+          pageSize:10,
+          orderByColumn:'id',
+          isAsc:'desc'
+        },
+        //地图服务地址
+        mapGeoServerUrl:"",
+      };
+    },
+    created() {
+      if(this.ycsyId === undefined){
+        this.showTitle = true;
+      }else{
+        this.showTitle = false;
+        this.$set(this.queryParams, "ycsyId", this.ycsyId);
+      }
+      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;
+      });
+    },
+    watch: {
+      ycsyId: function(newVal) {
+        this.applicationList =[];
+        this.finished = false;
+        this.$set(this.queryParams, "ycsyId", newVal);
+        this.getList();
+      },
+    },
+    methods: {
+      goAdd(){
+        window.location = 'paidUtilizeAdd';
+      },
+      getList(){
+        setTimeout(() => {
+          listYcsysfmx(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.finished = false;
+              this.queryParams.pageNum += 1 ;
+            }
+          });
+        }, 1000);
+      },
+      handlePay(row){
+        this.$set(row, "isJf", "1");
+        this.$set(row, "jfrq",  this.getNowFormatDate());
+        updateYcsysfmx(row).then(response => {
+          if(response.code != 200) throw response.msg;
+          this.$toast.success("缴费成功");
+          this.getList();
+        });
+      },
+      /** 时间转换 */
+      //获取当前日期
+      getNowFormatDate() {
+        var date = new Date();
+        var seperator1 = "-";
+        var month = date.getMonth() + 1;
+        var strDate = date.getDate();
+        if (month >= 1 && month <= 9) {
+          month = "0" + month;
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = "0" + strDate;
+        }
+        return date.getFullYear() + seperator1 + month + seperator1 + strDate;
+      },
+      /** 生成收费计划 */
+      generateFeePlanClick(row){
+        generateFeePlan(row).then((response) => {
+          this.$toast.success("收费计划已生成");
+          this.getList();
+        });
+      },
+      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">
+  .app-container {
+  .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;
+  }
+  }
+  }
+  /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>

src/views/yinnongIndex.vue

@@ -3,8 +3,10 @@
     <router-view />
     <van-tabbar route :placeholder="true" >
 <!--      <van-tabbar-item replace to="/yinnong/publicity" icon="bullhorn-o">公示</van-tabbar-item>-->
-      <van-tabbar-item replace to="/yinnong/doneCompleted/completed" icon="todo-list-o">待办</van-tabbar-item>
-      <van-tabbar-item replace to="/yinnong/doneCompleted/done" icon="completed">已办</van-tabbar-item>
+<!--      <van-tabbar-item replace to="/yinnong/doneCompleted/completed" icon="todo-list-o">待办</van-tabbar-item>-->
+      <van-tabbar-item replace to="/yinnong/doneCompleted/completedNew" icon="todo-list-o">待办(新)</van-tabbar-item>
+<!--      <van-tabbar-item replace to="/yinnong/doneCompleted/done" icon="completed">已办</van-tabbar-item>-->
+      <van-tabbar-item replace to="/yinnong/doneCompleted/doneNew" icon="completed">已办(新)</van-tabbar-item>
       <van-tabbar-item replace to="/yinnong/workbench" icon="apps-o">工作台</van-tabbar-item>
       <!-- <van-tabbar-item replace to="/yinnong/home" icon="wap-home-o">家园</van-tabbar-item> -->
       <van-tabbar-item replace to="/yinnong/my" icon="manager-o">我的</van-tabbar-item>

src/views/yinnongLogin.vue

@@ -306,7 +306,7 @@ export default {
         this.$store
           .dispatch("SmsLogin", this.formData)
           .then(() => {
-            this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {});
+            this.$router.push({ path: "/yinnong/doneCompleted/completedNew" }).catch(() => {});
           })
           .catch((error) => {
             this.loading = false;
@@ -341,7 +341,7 @@ export default {
         this.$store
           .dispatch("Login", this.formData)
           .then(() => {
-            this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {});
+            this.$router.push({ path: "/yinnong/doneCompleted/completedNew" }).catch(() => {});
           })
           .catch((error) => {
             console.log(error)
@@ -428,7 +428,7 @@ export default {
               this.$dialog.alert({
                   message: '您的初始密码：'+res.password,
               }).then(() => {
-                  this.$router.push({ path: "/yinnong/doneCompleted/completed" }).catch(() => {});
+                  this.$router.push({ path: "/yinnong/doneCompleted/completedNew" }).catch(() => {});
               });
             }
           })