diff --git a/src/permission.js b/src/permission.js
index c07c4cdf..7ef194d7 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -79,7 +79,6 @@ router.beforeEach((to, from, next) => {
         next()
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => {
-          console.log(to.path)
           // 拉取user_info
           const roles = res.roles
           // store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
@@ -90,7 +89,6 @@ router.beforeEach((to, from, next) => {
           next()
         }).catch(err => {
           store.dispatch('LogOut').then(() => {
-            console.log(to.path)
             // Message.error(err)
             if ('/authenticRight/index'.indexOf(to.path) !== -1) {
               next({ path: '/authenticRight/login' })
diff --git a/src/router/index.js b/src/router/index.js
index 0f9b9923..cc8c512b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1081,7 +1081,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList',
   //   name: 'approvalList',
   //   meta: {
-  //     title: '村户转账列表',
+  //     title: '银行卡转账列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList'], resolve)
@@ -1090,7 +1090,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList2',
   //   name: 'approvalList2',
   //   meta: {
-  //     title: '公务卡转账列表',
+  //     title: '信用卡还款列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve)
@@ -1135,7 +1135,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList11',
   //   name: 'approvalList11',
   //   meta: {
-  //     title: '现金使用列表',
+  //     title: '备服金支出列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList11'], resolve)
@@ -1153,7 +1153,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail',
   //   name: 'approvalDetail',
   //   meta: {
-  //     title: '银农村户转账申请',
+  //     title: '银农银行卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail'], resolve)
@@ -1162,7 +1162,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail2',
   //   name: 'approvalDetail2',
   //   meta: {
-  //     title: '银农公务卡转账申请',
+  //     title: '银农信用卡还款申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
@@ -1207,7 +1207,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail11',
   //   name: 'approvalDetail11',
   //   meta: {
-  //     title: '银农现金使用申请',
+  //     title: '银农备服金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
@@ -1225,7 +1225,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd',
   //   name: 'approvalAdd',
   //   meta: {
-  //     title: '添加村户转账申请',
+  //     title: '添加银行卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve)
@@ -1234,7 +1234,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd2',
   //   name: 'approvalAdd2',
   //   meta: {
-  //     title: '添加公务卡转账申请',
+  //     title: '添加信用卡还款申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
@@ -1279,7 +1279,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd11',
   //   name: 'approvalAdd11',
   //   meta: {
-  //     title: '添加现金使用申请',
+  //     title: '添加备服金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
@@ -1333,7 +1333,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify',
   //   name: 'approvalModify',
   //   meta: {
-  //     title: '修改村户转账申请',
+  //     title: '修改银行卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify'], resolve)
@@ -1342,7 +1342,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify2',
   //   name: 'approvalModify2',
   //   meta: {
-  //     title: '修改公务卡转账申请',
+  //     title: '修改信用卡还款申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2'], resolve)
@@ -1387,7 +1387,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify11',
   //   name: 'approvalModify11',
   //   meta: {
-  //     title: '修改现金使用申请',
+  //     title: '修改备服金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11'], resolve)
@@ -1649,7 +1649,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList',
     name: 'approvalList',
     meta: {
-      title: '村户转账列表',
+      title: '银行卡转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList'], resolve)
@@ -1658,7 +1658,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList2',
     name: 'approvalList2',
     meta: {
-      title: '公务卡转账列表',
+      title: '信用卡还款列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList2'], resolve)
@@ -1703,7 +1703,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList11',
     name: 'approvalList11',
     meta: {
-      title: '现金使用列表',
+      title: '备服金支出列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList11'], resolve)
@@ -1721,7 +1721,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail',
     name: 'approvalDetail',
     meta: {
-      title: '银农村户转账申请',
+      title: '银农银行卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail'], resolve)
@@ -1730,7 +1730,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail2',
     name: 'approvalDetail2',
     meta: {
-      title: '银农公务卡转账申请',
+      title: '银农信用卡还款申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
@@ -1775,7 +1775,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail11',
     name: 'approvalDetail11',
     meta: {
-      title: '银农现金使用申请',
+      title: '银农备服金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
@@ -1793,7 +1793,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd',
     name: 'approvalAdd',
     meta: {
-      title: '添加村户转账申请',
+      title: '添加银行卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd'], resolve)
@@ -1802,7 +1802,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd2',
     name: 'approvalAdd2',
     meta: {
-      title: '添加公务卡转账申请',
+      title: '添加信用卡还款申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
@@ -1847,7 +1847,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd11',
     name: 'approvalAdd11',
     meta: {
-      title: '添加现金使用申请',
+      title: '添加备服金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
@@ -1901,7 +1901,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify',
     name: 'approvalModify',
     meta: {
-      title: '修改村户转账申请',
+      title: '修改银行卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify'], resolve)
@@ -1910,7 +1910,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify2',
     name: 'approvalModify2',
     meta: {
-      title: '修改公务卡转账申请',
+      title: '修改信用卡还款申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify2'], resolve)
@@ -1955,7 +1955,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify11',
     name: 'approvalModify11',
     meta: {
-      title: '修改现金使用申请',
+      title: '修改备服金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify11'], resolve)
diff --git a/src/utils/request.js b/src/utils/request.js
index a11a7cd5..f3aeb732 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -69,7 +69,6 @@ service.interceptors.response.use(res => {
     })
       .then(() => {
         store.dispatch('LogOut').then(() => {
-          console.log(window.location.href);
           if(window.location.href.indexOf('lawEnforcement') != -1){
             window.location.href = '/lawEnforcement/login';
           } else if (window.location.href.indexOf('authenticRight') != -1) {
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 48e7570c..3ff25982 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -74,6 +74,7 @@
             placeholder="自动生成"
             input-align="right"
             disabled
+            v-show="false"
           />
           <van-field
             autocomplete="off"
@@ -83,6 +84,7 @@
             placeholder="自动生成"
             input-align="right"
             disabled
+            v-show="false"
           />
           <van-field
             autocomplete="off"
@@ -92,6 +94,7 @@
             label="宗地代码"
             placeholder="自动生成"
             disabled
+            v-show="false"
           />
           <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
             <template #input>
@@ -126,16 +129,18 @@
             placeholder="宅基地证书号"
             maxlength="50"
             autocomplete="off"
+            v-show="form.sffz=='Y'"
           />
           <van-field
             autocomplete="off"
             input-align="right"
             v-model="form.zjdpzmj"
-            name="宅基地批准面积(㎡)"
-            label="宅基地批准面积(㎡)"
+            name="批准面积(㎡)"
+            label="批准面积(㎡)"
             placeholder="单位：平方米"
             type="number"
             maxlength="15"
+            v-show="form.sffz=='Y'"
           />
           <van-field
             autocomplete="off"
@@ -166,6 +171,7 @@
             placeholder="自动生成"
             input-align="right"
             disabled
+            v-show="false"
           />
           <van-field
             autocomplete="off"
@@ -210,217 +216,226 @@
             required
             :rules="[{ required: true, message: '宗地四至-北不能为空' }]"
           />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.lyzkName"
-            name="当前利用状况"
-            label="当前利用状况"
-            placeholder="当前利用状况"
-            readonly
-            @click="showlyzk = true"
-          />
-          <van-field
-            v-model="form.lyzk"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.zjdxzyy"
-            name="宅基地闲置原因"
-            label="宅基地闲置原因"
-            placeholder="宅基地闲置原因"
-            maxlength="200"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.xzkssj"
-            name="闲置开始时间"
-            label="闲置开始时间"
-            placeholder="闲置开始时间"
-            readonly
-            @click="showPickerxzkssj = true"
-          />
-          <van-popup v-model:show="showPickerxzkssj" position="bottom">
-            <van-datetime-picker
-              type="date"
-              @confirm="onConfirmxzkssj"
-              @cancel="showPickerxzkssj = false"
-              :min-date="minDate"
-              :max-date="maxDate"
-            />
-          </van-popup>
-          <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="form.lzyx" direction="horizontal">
-                <van-radio name="1">有</van-radio>
-                <van-radio name="0">无</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field name="radio" label="有偿退出意向" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="form.yctcyx" direction="horizontal">
-                <van-radio name="1">有</van-radio>
-                <van-radio name="0">无</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field name="radio" label="被惩处经历" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="form.bccjl" direction="horizontal">
-                <van-radio name="1">有</van-radio>
-                <van-radio name="0">无</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            v-if="form.bccjl==1"
-            input-align="right"
-            v-model="form.bccbz"
-            name="被惩处备注"
-            label="被惩处备注"
-            placeholder="被惩处备注"
-            maxlength="200"
-          />
-          <van-field name="radio" label="宅基地取得方式" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="form.zjdqdfs" direction="horizontal">
-                <van-radio v-for="dict in zjdqdfsOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
+          <van-collapse v-model="activeZjd">
+            <van-collapse-item title="利用状况" name="1">
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.lyzkName"
+                name="当前利用状况"
+                label="当前利用状况"
+                placeholder="当前利用状况"
+                readonly
+                @click="showlyzk = true"
+              />
+              <van-field
+                v-model="form.lyzk"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.zjdxzyy"
+                name="闲置原因"
+                label="闲置原因"
+                placeholder="宅基地闲置原因"
+                maxlength="200"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.xzkssj"
+                name="闲置开始时间"
+                label="闲置开始时间"
+                placeholder="闲置开始时间"
+                readonly
+                @click="showPickerxzkssj = true"
+              />
+              <van-popup v-model:show="showPickerxzkssj" position="bottom">
+                <van-datetime-picker
+                  type="date"
+                  @confirm="onConfirmxzkssj"
+                  @cancel="showPickerxzkssj = false"
+                  :min-date="minDate"
+                  :max-date="maxDate"
+                />
+              </van-popup>
+              <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="form.lzyx" direction="horizontal">
+                    <van-radio name="1">有</van-radio>
+                    <van-radio name="0">无</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field name="radio" label="有偿退出意向" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="form.yctcyx" direction="horizontal">
+                    <van-radio name="1">有</van-radio>
+                    <van-radio name="0">无</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+            </van-collapse-item>
+            <van-collapse-item title="补充信息" name="2">
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.djName"
+                name="等级"
+                label="等级"
+                placeholder="等级"
+                @click="showdj = true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="form.dj"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.jg"
+                name="价格（万元）"
+                label="价格（万元）"
+                placeholder="价格（万元）"
+                maxlength="15"
+                type="number"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.qllxName"
+                name="权利类型"
+                label="权利类型"
+                placeholder="权利类型"
+                readonly
+                @click="showqllx = true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="form.qllx"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.qlxzName"
+                name="权利性质"
+                label="权利性质"
+                placeholder="权利性质"
+                readonly
+                @click="showqlxz = true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="form.qlxz"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.qlsdfsName"
+                name="权利设定方式"
+                label="权利设定方式"
+                placeholder="权利设定方式"
+                readonly
+                @click="showqlsdfs = true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="form.qlsdfs"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.rjl"
+                name="容积率"
+                label="容积率"
+                placeholder="容积率"
+              />
+              <van-field
+                input-align="right"
+                v-model="form.jzmd"
+                name="validator"
+                label="建筑密度"
+                placeholder="填写0~1小数"
+                :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"
+                type="number"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.jzxg"
+                name="建筑限高(m)"
+                label="建筑限高(m)"
+                placeholder="填写000.00~999.99小数"
+                :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"
+                type="number"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.zdt"
+                name="宗地图"
+                label="宗地图"
+                placeholder="宗地图"
+                maxlength="200"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.tfh"
+                name="图幅号"
+                label="图幅号"
+                placeholder="图幅号"
+                maxlength="50"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form.djh"
+                name="地籍号"
+                label="地籍号"
+                placeholder="自动生成"
+                disabled
+                v-show="false"
+              />
+              <van-field name="radio" label="被惩处经历" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="form.bccjl" direction="horizontal">
+                    <van-radio name="1">有</van-radio>
+                    <van-radio name="0">无</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                v-if="form.bccjl==1"
+                input-align="right"
+                v-model="form.bccbz"
+                name="被惩处备注"
+                label="被惩处备注"
+                placeholder="被惩处备注"
+                maxlength="200"
+              />
+              <van-field name="radio" label="宅基地取得方式" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="form.zjdqdfs" direction="horizontal">
+                    <van-radio v-for="dict in zjdqdfsOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+            </van-collapse-item>
+          </van-collapse>
+
           <van-field name="uploader" label="宅基地现场照片" autocomplete="off">
             <template #input>
               <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="20" accept="image/*"></van-uploader>
             </template>
           </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.djName"
-            name="等级"
-            label="等级"
-            placeholder="等级"
-            @click="showdj = true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="form.dj"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.jg"
-            name="价格（万元）"
-            label="价格（万元）"
-            placeholder="价格（万元）"
-            maxlength="15"
-            type="number"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.qllxName"
-            name="权利类型"
-            label="权利类型"
-            placeholder="权利类型"
-            readonly
-            @click="showqllx = true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="form.qllx"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.qlxzName"
-            name="权利性质"
-            label="权利性质"
-            placeholder="权利性质"
-            readonly
-            @click="showqlxz = true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="form.qlxz"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.qlsdfsName"
-            name="权利设定方式"
-            label="权利设定方式"
-            placeholder="权利设定方式"
-            readonly
-            @click="showqlsdfs = true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="form.qlsdfs"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.rjl"
-            name="容积率"
-            label="容积率"
-            placeholder="容积率"
-          />
-          <van-field
-            input-align="right"
-            v-model="form.jzmd"
-            name="validator"
-            label="建筑密度"
-            placeholder="填写0~1小数"
-            :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"
-            type="number"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.jzxg"
-            name="建筑限高(m)"
-            label="建筑限高(m)"
-            placeholder="填写000.00~999.99小数"
-            :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"
-            type="number"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.zdt"
-            name="宗地图"
-            label="宗地图"
-            placeholder="宗地图"
-            maxlength="200"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.tfh"
-            name="图幅号"
-            label="图幅号"
-            placeholder="图幅号"
-            maxlength="50"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.djh"
-            name="地籍号"
-            label="地籍号"
-            placeholder="自动生成"
-            disabled
-          />
+
           <van-field
             autocomplete="off"
             v-model="form.sjlyName"
@@ -634,13 +649,14 @@
             placeholder="宅基地代码"
             required
             :rules="[{ required: true, message: '宅基地代码不能为空' }]"
+            v-show="false"
           />
           <van-field
             autocomplete="off"
             input-align="right"
             v-model="form1.shyqrdbxm"
             name="使用权人代表姓名"
-            label="使用权人代表姓名"
+            label="权利人姓名"
             placeholder="使用权人代表姓名"
             maxlength="50"
             required
@@ -651,7 +667,7 @@
             input-align="right"
             v-model="form1.shyqrdbzjlxName"
             name="使用权人代表证件类型"
-            label="使用权人代表证件类型"
+            label="证件类型"
             placeholder="使用权人代表证件类型"
             @click="showshyqrdbzjlx = true"
             required
@@ -666,12 +682,28 @@
             input-align="right"
             v-model="form1.shyqrdbzjhm"
             name="使用权人代表证件号码"
-            label="使用权人代表证件号码"
+            label="证件号码"
             placeholder="使用权人代表证件号码"
             maxlength="30"
             required
             :rules="[{ required: true, message: '使用权人代表证件号码不能为空' },{validator:validatorIdcard,message:'身份证号格式错误！'}]"
           />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="form1.qlrlxName"
+            name="权利人类型"
+            label="权利人类型"
+            placeholder="权利人类型"
+            @click="showqlrlx = true"
+            required
+            :rules="[{ required: true, message: '权利人类型不能为空' }]"
+          />
+          <van-field
+            autocomplete="off"
+            v-model="form1.qlrlx"
+            style="display:none"
+          />
           <van-field
             autocomplete="off"
             input-align="right"
@@ -699,6 +731,7 @@
             label="权证印刷序列号"
             placeholder="权证印刷序列号"
             maxlength="100"
+            v-show="false"
           />
           <van-field
             autocomplete="off"
@@ -709,153 +742,155 @@
             placeholder="发证机关"
             maxlength="100"
           />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.sshyName"
-            name="所属行业"
-            label="所属行业"
-            placeholder="所属行业"
-            readonly
-            @click="showsyqrsshy = true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="form1.sshy"
-            style="display:none"
-          />
-          <van-field name="radio" label="国家/地区" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="form1.gj" direction="horizontal">
-                <van-radio name="1">中国</van-radio>
-                <van-radio name="2">其他</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.qlbl"
-            name="权利比例"
-            label="权利比例"
-            placeholder="单独为1，共有时2位小数"
-            type="number"
-            maxlength="20"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.hjszssName"
-            name="户籍所在省市"
-            label="户籍所在省市"
-            placeholder="户籍所在省市"
-            readonly
-            @click="showhjszss = true"
-          />
-          <van-field
-            style="display:none"
-            v-model="form1.hjszss"
-          />
-          <van-field name="radio" label="性别" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="form1.xb" direction="horizontal">
-                <van-radio name="1">男</van-radio>
-                <van-radio name="0">女</van-radio>
-                <van-radio name="2">未知</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.dh"
-            name="电话"
-            label="电话"
-            placeholder="电话"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.dz"
-            name="地址"
-            label="地址"
-            placeholder="地址"
-          />
-          <van-field autocomplete="off" name="radio" label="是否使用权人之间共有" input-align="right" required
-                     :rules="[{ required: true, message: '是否共有不能为空' }]">
-            <template #input>
-              <van-radio-group v-model="form1.sfsyqrzjgy" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            v-if="form1.sfsyqrzjgy=='Y'"
-            input-align="right"
-            v-model="form1.ftzdmj"
-            name="分摊宗地面积(㎡)"
-            label="分摊宗地面积(㎡)"
-            placeholder="单位：平方米"
-            type="number"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.qlrlxName"
-            name="权利人类型"
-            label="权利人类型"
-            placeholder="权利人类型"
-            @click="showqlrlx = true"
-            required
-            :rules="[{ required: true, message: '权利人类型不能为空' }]"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="form1.qlrlx"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.gyfsName"
-            name="共有方式"
-            label="共有方式"
-            placeholder="共有方式"
-            @click="showgyfs = true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="form1.gyfs"
-            style="display:none"
-          />
-          <van-field autocomplete="off" name="radio" label="是否本农村集体经济组织成员" input-align="right" required
-                     :rules="[{ required: true, message: '是否本农村集体经济组织成员不能为空' }]">
-            <template #input>
-              <van-radio-group v-model="form1.sfbncjtjjzzcy" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form1.suyqrdm"
-            name="所有权人代码"
-            label="所有权人代码"
-            placeholder="当使用权人是本村集体经济组织成员时必填"
-            readonly
-          />
-          <van-field name="radio" label="户口类型" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="form1.hklx" direction="horizontal">
-                <van-radio name="1">农业</van-radio>
-                <van-radio name="2">非农业</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
+          <van-collapse v-model="activeQlr">
+            <van-collapse-item title="基本信息" name="1">
+              <van-field name="radio" label="国家/地区" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="form1.gj" direction="horizontal">
+                    <van-radio name="1">中国</van-radio>
+                    <van-radio name="2">其他</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form1.hjszssName"
+                name="户籍所在省市"
+                label="户籍所在省市"
+                placeholder="户籍所在省市"
+                readonly
+                @click="showhjszss = true"
+              />
+              <van-field
+                style="display:none"
+                v-model="form1.hjszss"
+              />
+              <van-field name="radio" label="性别" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="form1.xb" direction="horizontal">
+                    <van-radio name="1">男</van-radio>
+                    <van-radio name="0">女</van-radio>
+                    <van-radio name="2">未知</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form1.dh"
+                name="电话"
+                label="电话"
+                placeholder="电话"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form1.dz"
+                name="地址"
+                label="地址"
+                placeholder="地址"
+              />
+              <van-field autocomplete="off" name="radio" label="是否本农村集体经济组织成员" input-align="right" required
+                         :rules="[{ required: true, message: '是否本农村集体经济组织成员不能为空' }]">
+                <template #input>
+                  <van-radio-group v-model="form1.sfbncjtjjzzcy" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form1.sshyName"
+                name="所属行业"
+                label="所属行业"
+                placeholder="所属行业"
+                readonly
+                @click="showsyqrsshy = true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="form1.sshy"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form1.suyqrdm"
+                name="所有权人代码"
+                label="所有权人代码"
+                placeholder="当使用权人是本村集体经济组织成员时必填"
+                readonly
+                v-show="false"
+              />
+              <van-field name="radio" label="户口类型" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="form1.hklx" direction="horizontal">
+                    <van-radio name="1">农业</van-radio>
+                    <van-radio name="2">非农业</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+            </van-collapse-item>
+            <van-collapse-item title="共有方式" name="2">
+
+              <van-field autocomplete="off" name="radio" label="是否持证人" input-align="right" required
+                         :rules="[{ required: true, message: '是否持证人' }]">
+                <template #input>
+                  <van-radio-group v-model="form1.sfczr" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field autocomplete="off" name="radio" label="是否使用权人之间共有" input-align="right" required
+                         :rules="[{ required: true, message: '是否共有不能为空' }]">
+                <template #input>
+                  <van-radio-group v-model="form1.sfsyqrzjgy" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form1.gyfsName"
+                name="共有方式"
+                label="共有方式"
+                placeholder="共有方式"
+                @click="showgyfs = true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="form1.gyfs"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="form1.qlbl"
+                name="权利比例"
+                label="权利比例"
+                placeholder="单独为1，共有时2位小数"
+                type="number"
+                maxlength="20"
+              />
+              <van-field
+                autocomplete="off"
+                v-if="form1.sfsyqrzjgy=='Y'"
+                input-align="right"
+                v-model="form1.ftzdmj"
+                name="分摊宗地面积(㎡)"
+                label="分摊宗地面积(㎡)"
+                placeholder="单位：平方米"
+                type="number"
+              />
+            </van-collapse-item>
+          </van-collapse>
+
           <van-field
             autocomplete="off"
             input-align="right"
@@ -1308,6 +1343,7 @@
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
+            style="display:none"
             disabled
             required
             :rules="[{ required: true, message: '宅基地代码不能为空' }]"
@@ -1319,6 +1355,7 @@
             name="农民房屋代码"
             label="农民房屋代码"
             placeholder="自动生成"
+            style="display:none"
             disabled
           />
           <van-field
@@ -1347,7 +1384,7 @@
             v-model="nmfwform.nmfwmj"
             @input="nmfwform.fjzdmj = nmfwform.nmfwmj,nmfwform.jzmj=nmfwform.nmfwmj"
             name="农民房屋面积(㎡)"
-            label="农民房屋面积(㎡)"
+            label="农民房屋面积"
             placeholder="农民房屋面积(㎡)"
             type="number"
             required
@@ -1379,30 +1416,15 @@
             label="农民房屋幢号"
             placeholder="自动生成"
             disabled
+            v-show="false"
           />
           <van-field
             autocomplete="off"
             input-align="right"
-            v-model="nmfwform.ch"
-            name="层号"
-            label="层号"
-            placeholder="层号"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.sjc"
-            name="实际层"
-            label="实际层"
-            placeholder="实际层"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.myc"
-            name="名义层"
-            label="名义层"
-            placeholder="名义层"
+            v-model="nmfwform.hh"
+            name="户号"
+            label="户号"
+            placeholder="户号"
           />
           <van-field
             autocomplete="off"
@@ -1413,417 +1435,456 @@
             placeholder="坐落"required
             :rules="[{ required: true, message: '坐落不能为空' }]"
           />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.sjcs"
-            name="实际层数"
-            label="实际层数"
-            placeholder="实际层数"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.hh"
-            name="户号"
-            label="户号"
-            placeholder="户号"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.hxName"
-            name="户型"
-            label="户型"
-            placeholder="户型"
-            @click="showhx=true"
-            readonly
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.hx"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.hxjgName"
-            name="户型结构"
-            label="户型结构"
-            placeholder="户型结构"
-            @click="showhxjg=true"
-            readonly
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.hxjg"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.fwjgName"
-            name="房屋结构"
-            label="房屋结构"
-            placeholder="房屋结构"
-            @click="showfwjg=true"
-            readonly
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.fwjg"
-            style="display:none"
-          />
-          <van-field
-            input-align="right"
-            v-model="nmfwform.fwytName"
-            name="房屋用途"
-            label="房屋用途"
-            placeholder="房屋用途"
-            @click="showfwyt=true"
-            readonly
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.fwyt"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.fjzdmj"
-            name="房屋占地面积(㎡)"
-            label="房屋占地面积(㎡)"
-            placeholder="房屋占地面积(㎡)"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.jzmj"
-            name="建筑面积(㎡)"
-            label="建筑面积(㎡)"
-            placeholder="建筑面积(㎡)"
-            type="number"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.zsh"
-            name="证书号"
-            label="证书号"
-            placeholder="证书号"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.djjg"
-            name="登记机构"
-            label="登记机构"
-            placeholder="登记机构"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.djsj"
-            name="登记时间"
-            label="登记时间"
-            placeholder="登记时间"
-            @click="showPickerdjsj=true"
-            readonly
-          />
-          <van-field name="radio" label="是否纠纷" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.sfjf" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field name="radio" label="是否查封" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.sfcf" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.cfqssj"
-            name="查封起始时间"
-            label="查封起始时间"
-            placeholder="查封起始时间"
-            readonly
-            @click="showPickercfqssj=true"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.cfjssj"
-            name="查封结束时间"
-            label="查封结束时间"
-            placeholder="查封结束时间"
-            readonly
-            @click="showPickercfjssj=true"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.fwlxName"
-            name="房屋类型"
-            label="房屋类型"
-            placeholder="房屋类型"
-            readonly
-            @click="showfwlx=true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.fwlx"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.sjlyName"
-            name="数据来源"
-            label="数据来源"
-            placeholder="数据来源"
-            readonly
-            @click="shownmfwsjly=true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.sjly"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.qxdm"
-            name="区县代码"
-            label="区县代码"
-            placeholder="区县代码"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.lyzkName"
-            name="利用状况"
-            label="利用状况"
-            placeholder="利用状况"
-            readonly
-            @click="shownmfwlyzk=true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.lyzk"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.xzyy"
-            name="闲置原因"
-            label="闲置原因"
-            placeholder="闲置原因"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.phlymsName"
-            name="盘活利用模式"
-            label="盘活利用模式"
-            placeholder="盘活利用模式"
-            readonly
-            @click="showphlyms=true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.phlyms"
-            style="display:none"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.jznd"
-            name="建筑年代"
-            label="建筑年代"
-            placeholder="建筑年代"
-          />
-          <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.sffz" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field name="radio" label="是否与其他人共有" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.isCommon" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.fwztName"
-            name="房屋状态"
-            label="房屋状态"
-            placeholder="房屋状态"
-            @click="shownmfwfwzt = true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.fwzt"
-            style="display:none"
-          />
-          <van-field name="radio" label="是否抵押" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.isMortgage" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            v-if="nmfwform.isMortgage=='Y'"
-            input-align="right"
-            v-model="nmfwform.mortgageMan"
-            name="抵押权利人"
-            label="抵押权利人"
-            placeholder="抵押权利人"
-          />
-          <van-field
-            autocomplete="off"
-            v-if="nmfwform.isMortgage=='Y'"
-            input-align="right"
-            v-model="nmfwform.mortgageMoney"
-            name="抵押金额"
-            label="抵押金额( 元)"
-            placeholder="抵押金额"
-            type="number"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.zwlxsj1"
-            name="债务履行开始时间"
-            label="债务履行开始时间"
-            placeholder="债务履行开始时间"
-            @click="showPickerzwlxsj1=true"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.zwlxsj2"
-            name="债务履行结束时间"
-            label="债务履行结束时间"
-            placeholder="债务履行结束时间"
-            @click="showPickerzwlxsj2=true"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.eay"
-            name="年收益"
-            label="年收益"
-            placeholder="年收益"
-          />
-          <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.lzyx" direction="horizontal">
-                <van-radio name="1">有</van-radio>
-                <van-radio name="0">无</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field name="radio" label="有偿退出意向" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.yctcyx" direction="horizontal">
-                <van-radio name="1">有</van-radio>
-                <van-radio name="0">无</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.bccjl"
-            name="被惩处经历"
-            label="被惩处经历"
-            placeholder="被惩处经历"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.bccbz"
-            name="被惩处备注"
-            label="被惩处备注"
-            placeholder="被惩处备注"
-          />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.qslyName"
-            name="权属来源"
-            label="权属来源"
-            placeholder="权属来源"
-            @click="shownmfwqsly=true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.qsly"
-            style="display:none"
-          />
-          <van-field name="radio" label="是否扩建改建" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.sfkjgj" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.pzsjName"
-            name="批准时间"
-            label="批准时间"
-            placeholder="批准时间"
-            @click="showPickerpzsj=true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.pzsj"
-            style="display:none"
-          />
-          <van-field name="radio" label="批准单位" input-align="right" autocomplete="off">
-            <template #input>
-              <van-radio-group v-model="nmfwform.pzdw" direction="horizontal">
-                <van-radio :name="'1'">县政府</van-radio>
-                <van-radio :name="'2'">乡政府</van-radio>
-              </van-radio-group>
-            </template>
-          </van-field>
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="nmfwform.tdzkName"
-            name="审批或建设前土地状况"
-            label="审批或建设前土地状况"
-            placeholder="审批或建设前土地状况"
-            @click="shownmfwtdzk=true"
-          />
-          <van-field
-            autocomplete="off"
-            v-model="nmfwform.tdzk"
-            style="display:none"
-          />
+          <van-collapse v-model="activeFw">
+            <van-collapse-item title="层数信息" name="1">
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.ch"
+                name="层号"
+                label="层号"
+                placeholder="层号"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.sjc"
+                name="实际层"
+                label="实际层"
+                placeholder="实际层"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.myc"
+                name="名义层"
+                label="名义层"
+                placeholder="名义层"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.sjcs"
+                name="实际层数"
+                label="实际层数"
+                placeholder="实际层数"
+              />
+            </van-collapse-item>
+            <van-collapse-item title="结构信息" name="2">
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.hxName"
+                name="户型"
+                label="户型"
+                placeholder="户型"
+                @click="showhx=true"
+                readonly
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.hx"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.fjzdmj"
+                name="房屋占地面积(㎡)"
+                label="房屋占地面积(㎡)"
+                placeholder="房屋占地面积(㎡)"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.jzmj"
+                name="建筑面积(㎡)"
+                label="建筑面积(㎡)"
+                placeholder="建筑面积(㎡)"
+                type="number"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.hxjgName"
+                name="户型结构"
+                label="户型结构"
+                placeholder="户型结构"
+                @click="showhxjg=true"
+                readonly
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.hxjg"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.fwjgName"
+                name="房屋结构"
+                label="房屋结构"
+                placeholder="房屋结构"
+                @click="showfwjg=true"
+                readonly
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.fwjg"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.fwlxName"
+                name="房屋类型"
+                label="房屋类型"
+                placeholder="房屋类型"
+                readonly
+                @click="showfwlx=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.fwlx"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.fwztName"
+                name="房屋状态"
+                label="房屋状态"
+                placeholder="房屋状态"
+                @click="shownmfwfwzt = true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.fwzt"
+                style="display:none"
+              />
+            </van-collapse-item>
+            <van-collapse-item title="利用状况" name="3">
+              <van-field
+                input-align="right"
+                v-model="nmfwform.fwytName"
+                name="房屋用途"
+                label="房屋用途"
+                placeholder="房屋用途"
+                @click="showfwyt=true"
+                readonly
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.fwyt"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.lyzkName"
+                name="利用状况"
+                label="利用状况"
+                placeholder="利用状况"
+                readonly
+                @click="shownmfwlyzk=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.lyzk"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.xzyy"
+                name="闲置原因"
+                label="闲置原因"
+                placeholder="闲置原因"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.phlymsName"
+                name="盘活利用模式"
+                label="盘活利用模式"
+                placeholder="盘活利用模式"
+                readonly
+                @click="showphlyms=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.phlyms"
+                style="display:none"
+              />
+              <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.lzyx" direction="horizontal">
+                    <van-radio name="1">有</van-radio>
+                    <van-radio name="0">无</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field name="radio" label="有偿退出意向" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.yctcyx" direction="horizontal">
+                    <van-radio name="1">有</van-radio>
+                    <van-radio name="0">无</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.eay"
+                name="年收益"
+                label="年收益"
+                placeholder="年收益"
+              />
+            </van-collapse-item>
+            <van-collapse-item title="纠纷惩处" name="4">
+              <van-field name="radio" label="是否纠纷" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.sfjf" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field name="radio" label="是否查封" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.sfcf" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field name="radio" label="是否扩建改建" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.sfkjgj" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.bccjl"
+                name="被惩处经历"
+                label="被惩处经历"
+                placeholder="被惩处经历"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.bccbz"
+                name="被惩处备注"
+                label="被惩处备注"
+                placeholder="被惩处备注"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.cfqssj"
+                name="查封起始时间"
+                label="查封起始时间"
+                placeholder="查封起始时间"
+                v-if="nmfwform.sfcf!=null&&nmfwform.sfcf=='Y'"
+                readonly
+                @click="showPickercfqssj=true"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.cfjssj"
+                name="查封结束时间"
+                label="查封结束时间"
+                placeholder="查封结束时间"
+                v-if="nmfwform.sfcf!=null&&nmfwform.sfcf=='Y'"
+                readonly
+                @click="showPickercfjssj=true"
+              />
+              <van-field name="radio" label="是否抵押" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.isMortgage" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                v-if="nmfwform.isMortgage=='Y'"
+                input-align="right"
+                v-model="nmfwform.mortgageMan"
+                name="抵押权利人"
+                label="抵押权利人"
+                placeholder="抵押权利人"
+              />
+              <van-field
+                autocomplete="off"
+                v-if="nmfwform.isMortgage=='Y'"
+                input-align="right"
+                v-model="nmfwform.mortgageMoney"
+                name="抵押金额"
+                label="抵押金额( 元)"
+                placeholder="抵押金额"
+                type="number"
+              />
+              <van-field
+                autocomplete="off"
+                v-if="nmfwform.isMortgage=='Y'"
+                input-align="right"
+                v-model="nmfwform.zwlxsj1"
+                name="债务履行开始时间"
+                label="债务履行开始时间"
+                placeholder="债务履行开始时间"
+                @click="showPickerzwlxsj1=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-if="nmfwform.isMortgage=='Y'"
+                input-align="right"
+                v-model="nmfwform.zwlxsj2"
+                name="债务履行结束时间"
+                label="债务履行结束时间"
+                placeholder="债务履行结束时间"
+                @click="showPickerzwlxsj2=true"
+              />
+            </van-collapse-item>
+            <van-collapse-item title="证书相关" name="5">
+              <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.sffz" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field name="radio" label="是否与其他人共有" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.isCommon" direction="horizontal">
+                    <van-radio name="Y">是</van-radio>
+                    <van-radio name="N">否</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.zsh"
+                name="证书号"
+                label="证书号"
+                placeholder="证书号"
+                v-if="nmfwform.sffz!=null&&nmfwform.sffz=='Y'"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.djjg"
+                name="登记机构"
+                label="登记机构"
+                placeholder="登记机构"
+                v-if="nmfwform.sffz!=null&&nmfwform.sffz=='Y'"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.djsj"
+                name="登记时间"
+                label="登记时间"
+                placeholder="登记时间"
+                v-if="nmfwform.sffz!=null&&nmfwform.sffz=='Y'"
+                @click="showPickerdjsj=true"
+                readonly
+              />
+            </van-collapse-item>
+            <van-collapse-item title="补充信息" name="6">
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.sjlyName"
+                name="数据来源"
+                label="数据来源"
+                placeholder="数据来源"
+                readonly
+                @click="shownmfwsjly=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.sjly"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.qxdm"
+                name="区县代码"
+                label="区县代码"
+                placeholder="区县代码"
+                v-show="false"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.jznd"
+                name="建筑年代"
+                label="建筑年代"
+                placeholder="建筑年代"
+              />
+
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.qslyName"
+                name="权属来源"
+                label="权属来源"
+                placeholder="权属来源"
+                @click="shownmfwqsly=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.qsly"
+                style="display:none"
+              />
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.pzsjName"
+                name="批准时间"
+                label="批准时间"
+                placeholder="批准时间"
+                @click="showPickerpzsj=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.pzsj"
+                style="display:none"
+              />
+              <van-field name="radio" label="批准单位" input-align="right" autocomplete="off">
+                <template #input>
+                  <van-radio-group v-model="nmfwform.pzdw" direction="horizontal">
+                    <van-radio :name="'1'">县政府</van-radio>
+                    <van-radio :name="'2'">乡政府</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field
+                autocomplete="off"
+                input-align="right"
+                v-model="nmfwform.tdzkName"
+                name="审批或建设前土地状况"
+                label="审批或建设前土地状况"
+                placeholder="审批或建设前土地状况"
+                @click="shownmfwtdzk=true"
+              />
+              <van-field
+                autocomplete="off"
+                v-model="nmfwform.tdzk"
+                style="display:none"
+              />
+            </van-collapse-item>
+          </van-collapse>
           <van-field
             autocomplete="off"
             input-align="right"
@@ -3160,6 +3221,12 @@
         fsssProductResh:this.guidProduct(),
         // 字典列表json
         dictTypeList:null,
+        //宅基地折叠面板
+        activeZjd:[],
+        //权利人折叠面板
+        activeQlr:[],
+        //房屋折叠面板
+        activeFw:[],
       };
     },
     created(){
@@ -5285,6 +5352,7 @@
               xb:'1',
               sfbncjtjjzzcy:'Y',
               sfsyqrzjgy:'N',
+              sfczr:'N',
               qlrlx:'10',
               qlrlxName:'个人',
               gyfs:'1',
@@ -5310,6 +5378,9 @@
             if(this.form1.sfsyqrzjgy==null||this.form1.sfsyqrzjgy==""){
               this.form1.sfsyqrzjgy = 'N'
             }
+            if(this.form1.sfczr==null||this.form1.sfczr==""){
+              this.form1.sfczr = 'N'
+            }
             if(this.form1.qlrlx==null||this.form1.qlrlx==""){
               this.form1.qlrlx = 'Y'
               this.form1.qlrlxName = '个人'
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 3168a299..d19f1f0f 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加村户转账申请</p>
+        <p style="font-weight: bold;">添加银行卡转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -388,7 +388,7 @@
       });
       let params1={
         accountType: "102",
-        "params":{townAccountType:'0'},
+       // "params":{townAccountType:'0'},
         status: "N",
       }
       getAccount(params1).then((response) => {
@@ -487,7 +487,7 @@
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           for (var i = 0; i < res.data.length; i++) {
             this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue
index 54bfd4ab..a139e0a3 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue
@@ -454,17 +454,15 @@
           this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方全称
-            payeeAccount: "", //收款账户
-            drawer: "", //提款人
-            incomeAmount: "", //提款金额
-            bankType: "", //资金用途
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
index 88dcbd2b..acb5c8bf 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加现金使用申请</p>
+        <p style="font-weight: bold;">添加备服金支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -457,17 +457,15 @@
           this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方全称
-            payeeAccount: "", //收款账户
-            drawer: "", //提款人
-            incomeAmount: "", //提款金额
-            bankType: "", //资金用途
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {
@@ -629,7 +627,6 @@
                 message: '此申请单中未上传任何附件，是否确认提交？',
               })
                 .then(() => {
-                  console.log(this.form)
                   addCash(this.form).then((response) => {
                     this.chargeItme.map(res => {
                       res.cashId = response.data.id
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
index ab2294dc..4745955c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加公务卡转账申请</p>
+        <p style="font-weight: bold;">添加信用卡还款申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -525,7 +525,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
@@ -627,7 +627,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
@@ -643,7 +643,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue
index e18e1850..f9327ba2 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue
@@ -485,7 +485,7 @@
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           for (var i = 0; i < res.data.length; i++) {
             this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
index 7244efb6..207c21a6 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
@@ -7,7 +7,7 @@
       @click-left="backDone"
     >
       <template #title>
-        <p style="font-weight: bold;">付款审批</p>
+        <p style="font-weight: bold;">转账/还款审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -209,7 +209,7 @@
           this.form = response.data;
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue
index 3e00afca..00eac7db 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">现金使用申请审批</p>
+        <p style="font-weight: bold;">备服金支出审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue
index dbffaa54..d518f437 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">汇票支出申请审批</p>
+        <p style="font-weight: bold;">汇票支出审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
index c535773f..22deb782 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看村户转账申请</p>
+        <p style="font-weight: bold;">查看银行卡转账申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -209,7 +209,7 @@
           this.form = response.data;
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
index 1704325c..0a5c9077 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看现金使用申请</p>
+        <p style="font-weight: bold;">查看备服金支出申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
index 07893705..5dd5b41c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看公务卡转账申请</p>
+        <p style="font-weight: bold;">查看信用卡还款申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -206,7 +206,7 @@
           this.form = response.data;
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
index 0b61f9f6..e56004ab 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">村户转账申请列表</p>
+          <p style="font-weight: bold;">银行卡转账申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
index 878f8652..8654086b 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">现金使用申请列表</p>
+          <p style="font-weight: bold;">备服金支出申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
index 58eb4787..c34ad1d1 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">公务卡转账申请列表</p>
+          <p style="font-weight: bold;">信用卡还款申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 5831914b..fdccd1cd 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改村户转账申请</p>
+        <p style="font-weight: bold;">修改银行卡转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -404,7 +404,7 @@
       });
       let params1={
         accountType: "102",
-        "params":{townAccountType:'0'},
+       // "params":{townAccountType:'0'},
         status: "N",
       }
       getAccount(params1).then((response) => {
@@ -454,7 +454,7 @@
           this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
@@ -498,7 +498,7 @@
         if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
           this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
         }else{
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
             payee: "", //收款方
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue
index 3820aacb..7c01e627 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue
@@ -437,17 +437,15 @@
           this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方全称
-            payeeAccount: "", //收款账户
-            drawer: "", //提款人
-            incomeAmount: "", //提款金额
-            bankType: "", //资金用途
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
index a76df047..9335c55a 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改现金使用申请</p>
+        <p style="font-weight: bold;">修改备服金支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -449,18 +449,15 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
index 630985d0..fea029ca 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
@@ -488,7 +488,6 @@
         }
       },
       getError(e){
-        console.log(e)
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       addChargeItme(index){
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue
index 0314671b..be982183 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue
@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改公务卡转账申请</p>
+        <p style="font-weight: bold;">修改信用卡还款申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -457,7 +457,7 @@
           this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
@@ -501,7 +501,7 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
             payee: "", //收款方
@@ -524,7 +524,7 @@
         console.log(this.queryParams)
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee;
               res.value = res.id;
               this.payeeList.push(res)
@@ -623,7 +623,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
@@ -902,7 +902,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
diff --git a/src/views/yinnong/workbench.vue b/src/views/yinnong/workbench.vue
index dc05515d..7b7c4eee 100644
--- a/src/views/yinnong/workbench.vue
+++ b/src/views/yinnong/workbench.vue
@@ -60,35 +60,35 @@
           </template>
         </van-cell>
         <van-grid :border="false">
-          <van-grid-item text="村户转账" :to="{name:'approvalList'}" >
+          <van-grid-item text="银行卡转账" :to="{name:'approvalList'}" >
             <div class="icon" slot="default" style="background:#FF4646;" >
               <img src="../../../static/images/onlineHome/icon_Y1.png" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">村户转账</p>
+            <p style="margin-top: 5px;color: #666666;">银行卡转账</p>
           </van-grid-item>
-          <van-grid-item text="代管转账" :to="{name:'approvalList4'}" >
-            <div class="icon" slot="default" style="background:#c568f5;" >
-              <img src="../../../static/images/onlineHome/icon_Y4.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">代管转账</p>
-          </van-grid-item>
-          <van-grid-item text="公务卡转账" :to="{name:'approvalList2'}" >
+<!--          <van-grid-item text="代管转账" :to="{name:'approvalList4'}" >-->
+<!--            <div class="icon" slot="default" style="background:#c568f5;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y4.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">代管转账</p>-->
+<!--          </van-grid-item>-->
+          <van-grid-item text="信用卡还款" :to="{name:'approvalList2'}" >
             <div class="icon" slot="default" style="background:#3ac2db;" >
               <img src="../../../static/images/onlineHome/icon_Y2.png" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">公务卡转账</p>
-          </van-grid-item>
-          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >
-            <div class="icon" slot="default" style="background:#FF6464;" >
-              <img src="../../../static/images/onlineHome/icon_Y6.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">现金提现</p>
+            <p style="margin-top: 5px;color: #666666;">信用卡还款</p>
           </van-grid-item>
-          <van-grid-item text="现金使用" :to="{name:'approvalList11'}" >
+<!--          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >-->
+<!--            <div class="icon" slot="default" style="background:#FF6464;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y6.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">现金提现</p>-->
+<!--          </van-grid-item>-->
+          <van-grid-item text="备服金支出" :to="{name:'approvalList11'}" >
             <div class="icon" slot="default" style="background:#7790FE;" >
               <img src="../../../static/images/onlineHome/icon_Y7.png" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">现金使用</p>
+            <p style="margin-top: 5px;color: #666666;">备服金支出</p>
           </van-grid-item>
           <van-grid-item text="汇票支出" :to="{name:'approvalList12'}" >
             <div class="icon" slot="default" style="background:#539ffd;" >
@@ -155,7 +155,6 @@
       },
       created() {
         getInfo().then(response => {
-          console.log(response.user);
           this.bookName = response.user.bookName
           this.deptName = response.user.deptName
           this.getBookList(response.user.loginDeptId);