diff --git a/src/router/index.js b/src/router/index.js
index 28d234cc..abb259af 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2375,49 +2375,22 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/homesteadSurvey/settle'], resolve)
   },
   {
-    path: '/houseAnnounce',
-    name: 'houseAnnounce',
-    meta: {
-      title: '公示查询',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseAnnounce'], resolve)
-  },
-  {
-    path: '/houseLicense',
-    name: 'houseLicense',
-    meta: {
-      title: '证书查看',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseLicense'], resolve)
-  },
-  {
-    path: '/houseLicenseDetail',
-    name: 'houseLicenseDetail',
-    meta: {
-      title: '证书查看',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseLicenseDetail'], resolve)
-  },
-  {
-    path: '/licensePermitEdit',
+    path: '/onlineHome/licensePermitEdit',
     name: 'licensePermitEdit',
     meta: {
       title: '修改许可证',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/licensePermitEdit'], resolve)
+    component: (resolve) => require(['@/views/onlineHome/homestead/certificate/licensePermitEdit'], resolve)
   },
   {
-    path: '/licenseRatificationEdit',
+    path: '/onlineHome/licenseRatificationEdit',
     name: 'licenseRatificationEdit',
     meta: {
       title: '修改批准书',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/licenseRatificationEdit'], resolve)
+    component: (resolve) => require(['@/views/onlineHome/homestead/certificate/licenseRatificationEdit'], resolve)
   },
   {
     path: '/proposerLite',
diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue
index 2f52fccd..d4f75635 100644
--- a/src/views/onlineHome/done.vue
+++ b/src/views/onlineHome/done.vue
@@ -8,9 +8,9 @@
       @click-left="goOnlineHomeIndex"
     />
     <van-tabs v-model="activeName" title-active-color="#1D6FE9" color="#1D6FE9" line-width="20px" swipeable @click="getList(0)">
-      <van-tab title="待办" name="1" >
+      <van-tab title="待办" name="1" url="#1">
       </van-tab>
-      <van-tab title="已办" name="2">
+      <van-tab title="已办" name="2" url="#2">
       </van-tab>
     </van-tabs>
     <van-pull-refresh v-model="refreshing" @refresh="getList(0)">
@@ -91,6 +91,17 @@
           this.getList();
         });
 
+        this.$nextTick(() => this.activeName = (location.hash || '#1').substr(1));
+        /*let self = this;
+        window.onpopstate = function (event) {
+          console.log(event, location);
+          let state = event.state;
+          if(state)
+          {
+            let activeName = state.type || '1';
+            self.$nextTick(() => self.activeName = activeName);
+          }
+        };*/
       },
       methods: {
         goOnlineHomeIndex(){
@@ -173,6 +184,7 @@
         goDetail(item){
           console.log(item)
           let type = item.formData.processKey;
+          //history.pushState({ type: this.activeName}, null);
           switch (type) {
             case 'baseApply':
             case 'landscope':
@@ -207,6 +219,9 @@
                 this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
                 break;
               }
+              default:
+                console.log("Unknown processKey: " + type);
+                break;
           }
         }
       },
diff --git a/src/views/onlineHome/homestead/certificate/certificateList.vue b/src/views/onlineHome/homestead/certificate/certificateList.vue
index 5bc274f7..c3130acc 100644
--- a/src/views/onlineHome/homestead/certificate/certificateList.vue
+++ b/src/views/onlineHome/homestead/certificate/certificateList.vue
@@ -1,114 +1,213 @@
 <template>
-    <div class="app-container">
-      <van-nav-bar
-        left-arrow
-        fixed
-        placeholder
-        @click-left="$router.back(-1)"
-      >
-        <template #title>
-          <p style="font-weight: bold;">证书查看</p>
-        </template>
-      </van-nav-bar>
+  <div>
+    <van-nav-bar
+      left-arrow
+      title="证书查看"
+      fixed
+      placeholder
+      @click-left="$router.back()"
+    >
+      <template #right>
+        <van-icon v-if="false" name="@/../static/images/icon/icon_flow.png" size="20" @click="openFilter"/>
+      </template>
+    </van-nav-bar>
+
+    <van-pull-refresh v-model="refreshing" @refresh="getList()">
       <van-list
         v-model="loading"
         :finished="finished"
+        :immediate-check="false"
         finished-text="没有更多了"
-        @load="getList"
+        @load="getList('+1')"
       >
-        <van-swipe-cell  v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.zrfdbmc+'-'+item.lzfs" value="查看证书" center :to="{name:'certificateSee', query: {id:item.id}}">
+        <van-swipe-cell v-for="(item,index) in list" :key="index" class="delegate">
+          <van-cell :label="item.idcard" center>
             <template #icon>
-              <van-icon name="../../../static/images/onlineHome/icon_zjd7.png" size="30" color="#7790FE" style="margin-right: 10px;" />
+              <van-icon name="@/../static/images/onlineHome/icon_zjd7.png" size="30" color="#7790FE" style="margin-right: 10px;" />
+            </template>
+            <template #title>
+              <p style="font-weight: bold;">{{item.projectName}}</p>
             </template>
-            <template #label>
-              <p>{{item.zrfdbzjhm}}</p>
+            <template #right-icon>
+              <van-button plain type="info" style="border: 0; font-weight: bold;" @click="openLicense(item)">查看证书</van-button>
             </template>
           </van-cell>
+          <template #right>
+            <van-row style="height: 100%;">
+              <van-col style="height: 100%;">
+                <van-button square text="查看申请" type="primary" style="height: 100%;" @click="viewItem(item)"/>
+              </van-col>
+              <van-col style="height: 100%;">
+                <van-button square text="许可证修改" type="info" style="height: 100%;" @click="editLicensePermit(item)"/>
+              </van-col>
+              <van-col style="height: 100%;">
+                <van-button square text="批准书修改" type="info" style="height: 100%;" @click="editLicenseRatification(item)"/>
+              </van-col>
+            </van-row>
+          </template>
         </van-swipe-cell>
       </van-list>
-    </div>
+    </van-pull-refresh>
+
+    <onlineHomeIndex :current="1"></onlineHomeIndex>
+
+    <van-popup
+      v-model="filterVisible"
+      closeable
+      position="top"
+      :close-on-click-overlay="true"
+      :lazy-render="false"
+    >
+      <van-form>
+        <van-cell title="筛选查询"></van-cell>
+        <van-field v-model="queryParams.memberName" label="申请户主" placeholder="申请户主" input-align="right"/>
+        <van-field v-model="queryParams.phone" label="联系电话" placeholder="联系电话" input-align="right"/>
+        <div style="margin: 0.2rem; text-align: right;">
+          <van-button type="info" native-type="submit" size="small" @click="resetQuery"> 重置 </van-button>
+          <van-button type="primary" native-type="submit" size="small" @click="getList(0)"> 查询 </van-button>
+        </div>
+      </van-form>
+    </van-popup>
+  </div>
 </template>
 
 <script>
-import { getList } from "@/api/onlineHome/homestead/circulation";
+import FieldSelect from "@/components/form/FieldSelect";
+import onlineHomeIndex from "@/views/onlineHomeIndex";
+import { getList } from "@/api/onlineHome/homestead/application";
+
 export default {
-    name: "certificateList",
+  components: {FieldSelect, onlineHomeIndex},
+  name: "HouseLicense",
   data() {
     return {
-      applicationList:[],
-      houseApplyStatus:[],
-      auditStatus:[],
+      list: [],
+      total: 0,
+      // ?pageNum=1&pageSize=10&orderByColumn=createTime&isAsc=desc&printLicense=Y
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        printLicense: 'Y',
+        orderByColumn: 'createTime',
+        isAsc: 'desc',
+        phone: '',
+        memberName: '',
+      },
+      refreshing: false,
       loading: false,
       finished: false,
-      queryParams:{
-        pageNum:1,
-        pageSize:10,
-        orderByColumn:'createTime',
-        isAsc:'desc',
-        printLicense: "Y"
-      }
-    };
+      options: {
+      },
+      filterVisible: false,
+    }
   },
   created() {
-    this.houseGetDicts("lzfs").then((response) => {
-      this.houseApplyStatus = response.data;
-    });
+    this.initOptions();
+    this.getList();
   },
   methods: {
-    getList(){
-      setTimeout(() => {
-        getList(this.queryParams).then(response => {
-          console.log(response)
-          for (var i = 0; i < response.rows.length; i++) {
-            var houseApplyStatus = this.selectDictLabel(this.houseApplyStatus, response.rows[i].lzfs);
-            response.rows[i].lzfs = houseApplyStatus;
-            var auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus);
-            response.rows[i].auditStatus = auditStatus;
-            this.applicationList.push(response.rows[i]);
-          }
-          console.log(this.applicationList.length >= response.total)
-          if(this.applicationList.length >= response.total){
-            this.finished = true;
-            return;
-          }else{
-            this.loading = false;
-            this.queryParams.pageNum += 1 ;
-          }
+    getList(target) {
+      let type = typeof (target);
+      console.log(type, target);
+      if (target === 0) {
+        this.refreshing = true;
+        this.finished = true;
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.filterVisible = false;
+      }
+      else if (type === 'number')
+        this.queryParams.pageNum = target;
+      else if (type === 'string') {
+        this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
+      }
+      else
+      {
+        this.refreshing = true;
+        this.finished = true;
+        this.resetQuery();
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.list = []
+      }
+      getList(this.queryParams).then((response) => {
+        console.log(response)
+        if (response.rows.length === 0) {
+          this.finished = true;
+          return;
+        }
+        response.rows.forEach((e) => {
+          this.list.push(e);
         });
-      }, 1000);
+        this.total += response.rows.length;
+        this.finished = this.total >= response.total;
+      }).finally(() => {
+        this.loading = false;
+        this.refreshing = false;
+      });
+    },
+    viewItem(item) {
+      this.$router.push({
+        name: 'proposerLite',
+        query: {
+          id: item.id,
+          type: 'view',
+        },
+      });
+    },
+    initOptions() {
+      for(let k in this.options)
+      {
+        this.houseGetDicts(k).then((res) => {
+          this.options[k] = res.data;
+        });
+      }
+    },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
+    openFilter() {
+      this.filterVisible = true;
+    },
+    resetQuery() {
+      this.queryParams.phone = '';
+      this.queryParams.memberName = '';
+    },
+    openLicense(item) {
+      this.$router.push({
+        name: 'certificateSee',
+        query: {
+          id: item.id,
+        },
+      });
+    },
+    editLicensePermit(item) {
+      this.$router.push({
+        name: 'licensePermitEdit',
+        query: {
+          id: item.id,
+        },
+      });
+    },
+    editLicenseRatification(item) {
+      this.$router.push({
+        name: 'licenseRatificationEdit',
+        query: {
+          id: item.id,
+        },
+      });
     },
   },
 }
 </script>
 
 <style scoped>
-  .app-container {
-    padding: 0.2rem 3%;
-  }
-  /deep/.van-cell__title{
-    flex: 0.7;
-  }
-  /deep/.van-cell__title span{
-    font-family: Arial;
-    font-size: 0.4rem;
-    font-weight: normal;
-  }
-  /deep/.van-cell__value{
-    flex: 0.3;
-    color: #1D6FE9;
-    font-weight: bold;
-  }
-  /deep/.van-swipe-cell{
-    margin-bottom: 0.2rem;
-    border-radius: 0.2rem;
-    overflow: hidden;
-    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
-  }
-  /deep/van-ellipsis{
-    font-weight: bold;
-  }
-  .delete-button {
-    height: 100%;
-  }
+.delegate {
+  width: 96%;
+  margin: 3% 2% 3% 2%;
+  border-radius: 0.18rem;
+  overflow: hidden;
+  box-shadow: 0.1rem 0.1rem 0.15rem 0.02rem rgba(0,0,0,0.16);
+}
 </style>
diff --git a/src/views/onlineHome/homestead/certificate/certificateSee.vue b/src/views/onlineHome/homestead/certificate/certificateSee.vue
index 9d9bd2e2..3271ed48 100644
--- a/src/views/onlineHome/homestead/certificate/certificateSee.vue
+++ b/src/views/onlineHome/homestead/certificate/certificateSee.vue
@@ -1,272 +1,395 @@
 <template>
-    <div class="app-container">
-      <van-nav-bar
-        left-arrow
-        fixed
-        placeholder
-        @click-left="$router.back(-1)"
-      >
-        <template #title>
-          <p style="font-weight: bold;">证书查看</p>
-        </template>
-      </van-nav-bar>
+  <div>
+    <van-nav-bar
+      left-arrow
+      title="证书查看"
+      fixed
+      placeholder
+      @click-left="$router.back()"
+    >
+    </van-nav-bar>
 
-      <van-tabs swipeable animated sticky color="#1D6FE9" title-active-color="#1D6FE9"	>
-        <van-tab title="规划许可证">
-          <div class="planningPermit-wrap">
-            <div class="planningPermit-first" style="display: block; overflow: hidden;" id="planningPermitFirst">
-              <div class="permit-main">
-                <div class="details_first_main" style="  width: 96%; padding:40px 20px; margin:0 auto; border:1px solid #000000;  height:680px">
-                  <div class="details_first_title" style=" font-size: 20px; font-weight: bold; text-align: center; line-height: 30px;">中华人民共和国</div>
-                  <div class="details_first_title" style=" font-size: 20px; font-weight: bold; text-align: center; line-height: 30px;">乡村建设规划许可证</div>
-                  <div class="details_first_page" style="text-align: right; font-size: 16px; padding: 10px 0 50px;">乡字第 <i style="text-decoration: underline">{{this.licenseForm.licensePermit.licenseKey}}</i> 号</div>
-                  <div class="details_first_cont" style=" font-size: 16px; line-height: 32px;">根据《中华人民共和国土地管理法》《中华人民共和国城乡规划法》和国家有关规定，经审核，本建设工程符合国土空间规划和用途管制要求，颁发此证。</div>
-                  <div class="licence_first_jg" style="padding-top: 100px; font-size: 16px; text-align: right;">填发机关:   {{this.licenseForm.licensePermit.issuingAuthority}}</div>
-                  <div class="licence_first_time" style="font-size: 16px; text-align: right;">填发时间:   {{this.licenseForm.licensePermit.issueDate}}</div>
-                </div>
 
+    <van-tabs color="#1D6FE9" :lazy-render="false" v-model="activeName" swipeable animated sticky title-active-color="#1D6FE9">
+      <van-tab title="规划许可证" key="0">
+        <div class="planningPermit-wrap wrap-root">
+          <div class="planningPermit-first">
+            <div class="permit-main section">
+              <div class="details_first_main part">
+                <div class="details_first_title title">中华人民共和国</div>
+                <div class="details_first_title title">乡村建设规划许可证</div>
+                <div class="details_first_page no-label">乡字第 <i class="no">{{this.licenseForm.licensePermit.licenseKey}}</i> 号</div>
+                <div class="details_first_cont content">根据《中华人民共和国土地管理法》《中华人民共和国城乡规划法》和国家有关规定，经审核，本建设工程符合国土空间规划和用途管制要求，颁发此证。</div>
+                <div class="licence_first_jg label" style="padding-top: 3.5rem;">填发机关:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licensePermit.issuingAuthority}}</div>
+                <div class="licence_first_time label">日 期:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licensePermit.issueDate}}</div>
               </div>
-              <div class="details_page" style="margin-top: 0.4rem;">
-                <div class="details_page_main" style="width: 96%; padding:40px 20px; margin:0 auto; border:1px solid #000000; font-size: 14px;  height:680px">
-                  <table >
-                    <tr>
-                      <td width="30%">建设单位</td> <td >{{this.licenseForm.licensePermit.constructionUnit}}</td>
-                    </tr>
-                    <tr>
-                      <td>建设项目</td> <td>{{this.licenseForm.licensePermit.constructionUnit}}</td>
-                    </tr>
-                    <tr>
-                      <td>建设位置</td> <td>{{this.licenseForm.licensePermit.constructionLocation}}</td>
-                    </tr>
-                    <tr>
-                      <td>建设规模</td> <td>{{ this.licenseForm.licensePermit.constructionScale }}</td>
-                    </tr>
-                    <tr>
-                      <td>{{ this.licenseForm.licenseRatification.west }}</td><td>{{ this.licenseForm.licenseRatification.north }}</td>
-                    </tr>
-                  </table>
-                  <ul style="padding:50px 5px 5px;list-style:none; font-size: 12px; line-height:24px;text-align: start">
-                    <li style="text-align: start">一、 本证是经自然资源主管部门依法审核，在乡、村庄规划区内有关建设工程符合国土空间规划和用途管制要求的法律凭证。</li>
-                    <li>二、 依法应当取得本证，但未取得本证或违反本证规定的，均属违法行为。</li>
-                    <li>三、 未经发证机关审核同意，本证的各项规定不得随意变更。</li>
-                    <li>四、 自然资源主管部门依法有权查验本证，建设单位（个人）有责任提交查验。</li>
-                    <li>五、 本证所需附图及附件由发证机关依法确定，与本证具有同等法律效力。</li>
-                  </ul>
-                </div>
+            </div>
+
+            <div class="details_page section">
+              <div class="details_page_main part">
+                <table>
+                  <tr>
+                    <td style="width: 2.6rem;">建设单位(个人)</td> <td >{{this.licenseForm.licensePermit.constructionUnit}}</td>
+                  </tr>
+                  <tr>
+                    <td>建设项目名称</td> <td>{{this.licenseForm.licensePermit.constructionUnit}}</td>
+                  </tr>
+                  <tr>
+                    <td>建设位置</td> <td>{{this.licenseForm.licensePermit.constructionLocation}}</td>
+                  </tr>
+                  <tr>
+                    <td>建设规模</td> <td>{{ this.licenseForm.licensePermit.constructionScale }}</td>
+                  </tr>
+                  <!--                <tr>
+                                    <td>{{ this.licenseForm.licenseRatification.west }}</td><td>{{ this.licenseForm.licenseRatification.north }}</td>
+                                  </tr>-->
+                  <tr>
+                    <td>附图及附件名称</td>
+                    <td>
+                      <ul class="list">
+                        <li v-for="file in attachmentList" class="list__item-content">
+                          {{file.fileName}}
+                        </li>
+                      </ul>
+                    </td>
+                  </tr>
+                </table>
+                <div class="details_first_title title" style="text-align: left; padding-top: 0.2rem; padding-bottom: 0.2rem; font-size: 0.52rem; line-height: 0.8rem;">遵守事项</div>
+                <ul class="list" style="padding: 0.1rem 0.1rem; font-size: 0.35rem; line-height: 0.6rem;">
+                  <li>一、 本证是经自然资源主管部门依法审核，在乡、村庄规划区内有关建设工程符合国土空间规划和用途管制要求的法律凭证。</li>
+                  <li>二、 依法应当取得本证，但未取得本证或违反本证规定的，均属违法行为。</li>
+                  <li>三、 未经发证机关审核同意，本证的各项规定不得随意变更。</li>
+                  <li>四、 自然资源主管部门依法有权查验本证，建设单位（个人）有责任提交查验。</li>
+                  <li>五、 本证所需附图及附件由发证机关依法确定，与本证具有同等法律效力。</li>
+                </ul>
               </div>
             </div>
-            <div class="planningPermit-two" id="planningPermitTwo">
-              <table style="height:800px">
+          </div>
+
+          <div class="planningPermit-two" style="display: block; overflow: hidden;">
+            <div class="details_page">
+              <table>
                 <tr>
-                  <td style="width:40px">宅<br />基<br />地<br />坐<br />落<br />平<br />面<br />位<br />置<br />图</td>
-                  <td></td>
+                  <td style="width: 1rem; height: 12rem;">宅<br />基<br />地<br />坐<br />落<br />平<br />面<br />位<br />置<br />图</td>
+                  <td>
+                    <RawImageCarousel :images="locationPlanList" url-label="url" name-label="fileName" style="width: 100%; height: 100%;" v-if="locationPlanList.length > 0"></RawImageCarousel>
+                  </td>
                 </tr>
-                <tr style="height:80px">
+                <tr>
                   <td>备注</td>
                   <td>图中需载明宅基地的具体位置、长宽、四至，并标明与永久性参照物的具体距离。</td>
                 </tr>
               </table>
-              <ul style="padding:50px 5px 5px;list-style:none; font-size: 12px; line-height:24px;text-align: start; width:90%; margin:0 auto;">
+              <ul class="list" style="padding: 0.6rem 0.1rem 0.1rem; width: 92%; margin:0 auto;">
                 <li>填写说明：</li>
                 <li>1.编号规则:编号数字共16位，前6位数字按照《中华人民共和国行政区划代码》（详见民政部网站www.mca.gov.cn）执行；7-9位数字表示街道（地区）办事处、镇、乡（苏木），按GB/T10114的规定执行；10-13位数字代表证书发放年份；14-16位数字代表证书发放序号。</li>
                 <li>2.批准书有效期:指按照本省（区、市）宅基地管理有关规定，宅基地申请批准后农户必须开工建设的时间。</li>
               </ul>
             </div>
           </div>
-        </van-tab>
-        <van-tab title="宅基地批准书">
-          <div class="licenceAround-wrap" style=" display: block; overflow: hidden;" id="licenceAroundWrap">
-            <div class="licence_first_page">
-              <div class="number-title" style="padding: 0 2%;  height: 45px; line-height: 45px;">
-                农宅字 <i style="text-decoration: underline">{{this.licenseForm.licenseRatification.approvalNumber}}</i> 号
-              </div>
-              <div class="licence_first_main" style="width: 96%; margin: 0 auto; border:1px solid #000000;  padding:70px 20px;">
-                <div class="content" style="  line-height: 36px; padding-top: 10px; text-align: center;">
-                  根据《中华人民共和国土地管理法》规定，本项农村村民宅基地用地  业经有权机关批准，特发此书。
-                  请严格按照本批准书要求使用宅基地。</div>
-                <div class="ft_jg" style=" margin-top: 90px; text-align: center; line-height: 32px;">填发机关:   {{this.licenseForm.licenseRatification.issuingAuthority}}</div>
-                <div class="ft_time" style="  text-align: center; line-height: 32px;">填发时间:   {{this.licenseForm.licenseRatification.issueDate}}</div>
-              </div>
+        </div>
+      </van-tab>
+
+      <van-tab title="宅基地批准书" key="1">
+        <div class="licenceAround-wrap wrap-root">
+          <div class="licence_first_page section" style="padding-top: 0.5rem;">
+            <div class="details_first_title title">农村宅基地批准书</div>
+            <div class="number-title no-sub-label" >
+              农宅字 <i class="no">{{this.licenseForm.licenseRatification.approvalNumber}}</i>号
             </div>
-            <div class="licence_two_page">
-              <div class="number-title"  style="padding: 0 2%;  height: 45px; line-height: 45px;">
-                农宅字 <i style="text-decoration: underline">{{this.licenseForm.licenseRatification.approvalNumber}}</i> 号
-              </div>
-              <div class="licence_two_main">
-                <table>
-                  <tr>
-                    <td>申请人姓名</td> <td colspan="2">{{this.licenseForm.licenseRatification.memberName}}</td>
-                  </tr>
-                  <tr>
-                    <td>批准用地面积</td> <td colspan="2">{{this.licenseForm.licenseRatification.landArea}} 平方米</td>
-                  </tr>
-                  <tr>
-                    <td>土地所有权人</td> <td colspan="2">{{this.licenseForm.licenseRatification.landOwner}}</td>
-                  </tr>
-                  <tr>
-                    <td>土地用途</td> <td colspan="2">{{ this.landUseFormat(this.licenseForm.licenseRatification.landUse) }}</td>
-                  </tr>
-                  <tr>
-                    <td>土地坐落<br/>(详见附图)</td> <td  colspan="2">{{ this.licenseForm.licenseRatification.location }}</td>
-                  </tr>
-                  <tr>
-                    <td rowspan="2">四  至</td> <td>{{ this.licenseForm.licenseRatification.east }}</td><td>{{ this.licenseForm.licenseRatification.south }}</td>
-                  </tr>
-                  <tr>
-                    <td>{{ this.licenseForm.licenseRatification.west }}</td><td>{{ this.licenseForm.licenseRatification.north }}</td>
-                  </tr>
-                  <tr>
-                    <td>批准书有效期</td><td colspan="2">{{this.licenseForm.licenseRatification.startTime +'至'+this.licenseForm.licenseRatification.endTime }}</td>
-                  </tr>
-                  <tr style="height: 100px">
-                    <td colspan="3">备注</td>
-                  </tr>
-                </table>
+            <div class="licence_first_main" style="border:1px solid #000000;  padding: 2rem 0.4rem;">
+              <div class="content">
+                根据《中华人民共和国土地管理法》规定，本项农村村民宅基地用地  业经有权机关批准，特发此书。
+                请严格按照本批准书要求使用宅基地。
               </div>
+              <div class="ft_jg label" style="padding-top: 2.5rem;">填发机关:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licenseRatification.issuingAuthority}}</div>
+              <div class="ft_time label">填发时间:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licenseRatification.issueDate}}</div>
             </div>
-            <div class="licence_three_page">
-              <div  class="number-title"  style="padding: 0 2%;  height: 45px; line-height: 45px;">
-                农宅字 <i style="text-decoration: underline">{{this.licenseForm.licenseRatification.approvalNumber}}</i> 号
-              </div>
+          </div>
+
+          <div class="licence_two_page section" style="margin-top: 0.5rem;">
+            <div class="details_first_title title">农村宅基地批准书（存根）</div>
+            <div class="number-title no-sub-label">
+              农宅字 <i class="no">{{this.licenseForm.licenseRatification.approvalNumber}}</i> 号
+            </div>
+            <div class="licence_two_main">
               <table>
                 <tr>
-                  <td>申请人姓名</td> <td colspan="2">{{this.licenseForm.licenseRatification.memberName}}</td>
+                  <td style="width: 2.6rem;">申请人姓名</td> <td colspan="8">{{this.licenseForm.licenseRatification.memberName}}</td>
                 </tr>
                 <tr>
-                  <td>批准用地面积</td> <td colspan="2">{{this.licenseForm.licenseRatification.landArea}} 平方米</td>
+                  <td>批准用地面积</td> <td colspan="8">{{this.licenseForm.licenseRatification.landArea}} 平方米</td>
                 </tr>
                 <tr>
-                  <td>土地所有权人</td> <td colspan="2">{{this.licenseForm.licenseRatification.landOwner}}</td>
+                  <td>其中：房基占地</td> <td colspan="8">{{this.licenseForm.licenseRatification.fjzdmj}} 平方米</td>
                 </tr>
                 <tr>
-                  <td>土地用途</td> <td colspan="2">{{ this.landUseFormat(this.licenseForm.licenseRatification.landUse) }}</td>
+                  <td>土地所有权人</td> <td colspan="8">{{this.licenseForm.licenseRatification.landOwner}}</td>
                 </tr>
                 <tr>
-                  <td>土地坐落<br/>(详见附图)</td> <td  colspan="2">{{ this.licenseForm.licenseRatification.location }}</td>
+                  <td>土地用途</td> <td colspan="8">{{ formatDict(options.land_use, licenseForm.licenseRatification.landUse) }}</td>
                 </tr>
                 <tr>
-                  <td rowspan="2">四  至</td> <td>{{ this.licenseForm.licenseRatification.east }}</td><td>{{ this.licenseForm.licenseRatification.south }}</td>
+                  <td>土地坐落<br/>(详见附图)</td> <td colspan="8">{{ this.licenseForm.licenseRatification.location }}</td>
                 </tr>
                 <tr>
-                  <td>{{ this.licenseForm.licenseRatification.west }}</td><td>{{ this.licenseForm.licenseRatification.north }}</td>
+                  <td rowspan="2">四  至</td>
+                  <td style="width: 1.2rem;">东</td><td colspan="3">{{ this.licenseForm.licenseRatification.east }}</td>
+                  <td style="width: 1.2rem;">南</td><td colspan="3">{{ this.licenseForm.licenseRatification.south }}</td>
                 </tr>
                 <tr>
-                  <td>批准书有效期</td><td colspan="2">{{this.licenseForm.licenseRatification.startTime +'至'+this.licenseForm.licenseRatification.endTime }}</td>
+                  <td style="width: 1.2rem;">西</td><td colspan="3">{{ this.licenseForm.licenseRatification.west }}</td>
+                  <td style="width: 1.2rem;">北</td><td colspan="3">{{ this.licenseForm.licenseRatification.north }}</td>
                 </tr>
-                <tr style="height: 100px">
-                  <td colspan="3">备注</td>
+                <tr>
+                  <td>批准书有效期</td><td colspan="8">{{this.licenseForm.licenseRatification.startTime +'至'+this.licenseForm.licenseRatification.endTime }}</td>
+                </tr>
+                <tr style="height: 2rem;" >
+                  <td colspan="9" style="text-align: left;">备注:</td>
                 </tr>
               </table>
             </div>
           </div>
-        </van-tab>
-      </van-tabs>
 
-    </div>
+          <div class="licence_three_page section" style="margin-top: 0.5rem;">
+            <div  class="number-title no-sub-label">
+              农宅字 <i class="no">{{this.licenseForm.licenseRatification.approvalNumber}}</i> 号
+            </div>
+            <table>
+              <tr>
+                <td style="width: 2.6rem;">申请人姓名</td> <td colspan="8">{{this.licenseForm.licenseRatification.memberName}}</td>
+              </tr>
+              <tr>
+                <td>批准用地面积</td> <td colspan="8">{{this.licenseForm.licenseRatification.landArea}} 平方米</td>
+              </tr>
+              <tr>
+                <td>房基占地面积</td> <td colspan="8">{{this.licenseForm.licenseRatification.fjzdmj}} 平方米</td>
+              </tr>
+              <tr>
+                <td>土地所有权人</td> <td colspan="8">{{this.licenseForm.licenseRatification.landOwner}}</td>
+              </tr>
+              <tr>
+                <td>土地用途</td> <td colspan="8">{{ formatDict(options.land_use, licenseForm.licenseRatification.landUse) }} </td>
+              </tr>
+              <tr>
+                <td>土地坐落<br/>(详见附图)</td> <td  colspan="8">{{ this.licenseForm.licenseRatification.location }}</td>
+              </tr>
+              <tr>
+                <td rowspan="2">四  至</td>
+                <td style="width: 1.2rem;">东</td><td colspan="3">{{ this.licenseForm.licenseRatification.east }}</td>
+                <td style="width: 1.2rem;">南</td><td colspan="3">{{ this.licenseForm.licenseRatification.south }}</td>
+              </tr>
+              <tr>
+                <td style="width: 1.2rem;">西</td><td colspan="3">{{ this.licenseForm.licenseRatification.west }}</td>
+                <td style="width: 1.2rem;">北</td><td colspan="3">{{ this.licenseForm.licenseRatification.north }}</td>
+              </tr>
+              <tr>
+                <td>批准书有效期</td><td colspan="8">{{this.licenseForm.licenseRatification.startTime +'至'+this.licenseForm.licenseRatification.endTime }}</td>
+              </tr>
+              <tr style="height: 2rem;">
+                <td colspan="9" style="text-align: left;">备注:</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </van-tab>
+    </van-tabs>
+
+    <onlineHomeIndex :current="1"></onlineHomeIndex>
+  </div>
 </template>
 
 <script>
-import { selectAllLicense } from "@/api/onlineHome/homestead/circulation";
+import {selectAllLicense} from "@/api/onlineHome/homestead/houseProposer";
+import onlineHomeIndex from "@/views/onlineHomeIndex";
+import { attachmentFind } from "@/api/onlineHome/homestead/application";
+import RawImageCarousel from "@/components/house/RawImageCarousel";
+
 export default {
-  name: "applicationList",
+  components: {onlineHomeIndex, RawImageCarousel},
+  name: "HouseLicenseDetail",
   data() {
     return {
-      landUseOptions:[],
+      proposerId: null,
       licenseForm:{
         "licensePermit": {
           "searchValue": null,
-          "createBy": "system",
-          "createTime": "2021-06-28 14:41:49",
+          "createBy": "",
+          "createTime": "",
           "updateBy": "",
           "updateTime": null,
-          "params": {},
-          "id": 3,
-          "applyProposerId": 27,
-          "year": "2021",
-          "licenseKey": "5001010062021001",
-          "issuingAuthority": "system",
-          "issueDate": "2021-06-28",
-          "constructionUnit": "李新新",
-          "constructionItem": "2",
-          "constructionLocation": "1",
-          "constructionScale": "建筑层数:1建筑面积:1.00建筑高度:1.00",
+          "proposerId": null,
+          "applyProposerId": null,
+          "year": "",
+          "licenseKey": "",
+          "issuingAuthority": "",
+          "issueDate": "",
+          "constructionUnit": "",
+          "constructionItem": "",
+          "constructionLocation": "",
+          "constructionScale": "",
           "locationPlan": null
         },
         "licenseRatification": {
           "searchValue": null,
           "createBy": "",
-          "createTime": "2021-06-28 14:41:49",
+          "createTime": '',
           "updateBy": "",
           "updateTime": null,
-          "params": {},
-          "id": 3,
-          "applyProposerId": 27,
+          "proposerId": '',
+          "applyProposerId": '',
           "year": "2021",
-          "approvalNumber": "5001010062021001",
-          "issuingAuthority": "system",
-          "issueDate": "2021-06-28",
-          "memberName": "李新新",
-          "landArea": 111.00,
-          "landOwner": "李新新",
-          "landUse": "072",
-          "location": "1",
-          "east": "11",
-          "west": "11",
-          "south": "1111",
-          "north": "111",
-          "startTime": "2021-06-28",
-          "endTime": "2022-06-28",
-          "remark": null
+          "approvalNumber": "",
+          "issuingAuthority": "",
+          "issueDate": "",
+          "memberName": "",
+          "landArea": 0,
+          "landOwner": "",
+          "landUse": "",
+          "location": "",
+          "east": "",
+          "west": "",
+          "south": "",
+          "north": "",
+          "startTime": "",
+          "endTime": "",
+          "remark": '',
+          'fjzdmj': 0, // 房基占地面积
         },
       },
-      activeName:"first",
-    };
+      activeName: 0,
+      options: {
+        land_use: [],
+      },
+      attachmentList: [],
+      locationPlanList: [],
+    }
   },
-  mounted() {
-    this.getDicts("land_use").then((resp) => {
-      this.landUseOptions = resp.data;
-    });
-    selectAllLicense(this.$route.query.id).then((response) => {
-      console.log(response.data)
-      this.licenseForm = response.data;
-      this.updatePermitOpen = true;
-      this.updatePermitTitle = "修改许可证";
-    });
+  created() {
+    this.proposerId = this.$route.query.id;
+    this.initOptions();
+    this.getDetail();
   },
   methods: {
-    landUseFormat(key) {
-      return this.selectDictLabel(this.landUseOptions,key);
+    getDetail() {
+      selectAllLicense(this.proposerId).then((response) => {
+        this.licenseForm = response.data;
+        if(this.licenseForm.licensePermit.locationPlan)
+        {
+          const Host = this.$store.getters.baseRoutingUrl;
+          let list = JSON.parse(this.licenseForm.licensePermit.locationPlan);
+          this.locationPlanList = list.map((x) => {
+            x.url = Host + x.fileUrl;
+            return x;
+          })
+        }
+        this.getAttachments();
+      }).catch((e) => {
+        this.$toast.fail('获取证书失败!');
+      });
     },
-  }
+    initOptions() {
+      for(let k in this.options)
+      {
+        this.houseGetDicts(k).then((res) => {
+          this.options[k] = res.data;
+        });
+      }
+    },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
+    getAttachments() {
+      this.attachmentList = [];
+      let cond = {
+        tableId: this.proposerId,
+        tableName: 't_house_apply_proposer',
+        fileType: 13,
+      };
+      attachmentFind(cond).then(resp => {
+        this.attachmentList = resp.data;
+      });
+    },
+  },
 }
 </script>
 
-<style scoped>
-  .app-container {
-    padding-bottom: 5%;
+<style scoped lang="scss">
+table {
+  line-height: 2rem;
+  text-align: center;
+  border-collapse: collapse;
+  width: 96%;
+  margin: 0 auto;
+}
+td {
+  line-height: 1rem;
+  border: 1px solid #000000;
+  border-collapse: collapse;
+  font-size: 0.35rem;
+}
+.planningPermit-two{
+  //margin-top: 30px;
+}
+.wrap-root {
+  color: #606266;
+  .title {
+    font-size: 0.55rem;
+    font-weight: bold;
+    text-align: center;
+    line-height: 0.8rem;
   }
-  .main-box{
-    padding: 4% 3%;
-    background-color: #FFF;
-    margin-top: 0.3rem;
+  .no-label {
+    text-align: right;
+    font-size: 0.45rem;
+    line-height: 0.6rem;
+    padding: 0.5rem 0 0.5rem;
   }
-
-  table {
-    line-height: 25px;
-    text-align: center;
-    border-collapse: collapse;
-    width:96%;
-    border-collapse:collapse;
-    text-align:center;
-    margin:0 auto;
+  .no-sub-label {
+    text-align: right;
+    font-size: 0.4rem;
+    line-height: 0.5rem;
+    padding: 0.2rem 0.1rem 0.2rem;
+  }
+  .no {
+    text-decoration: underline;
+    font-style:oblique;
   }
-  td {
-    line-height: 36px;
-    border: 1px solid #000000;
-    border-collapse: collapse;
-    padding: 15px 0;
+  .content {
+    font-size: 0.45rem;
+    line-height: 0.8rem;
   }
-  .planningPermit-two{
-    margin-top: 30px;
+  .label {
+    font-size: 0.45rem;
+    text-align: right;
+    line-height: 0.8rem;
+    padding-right: 0.3rem;
+  }
+
+  .section {
+    width: 96%;
+    margin: auto;
+    .part {
+      width: 100%;
+      padding: 1.5rem 0.35rem;
+      margin: 0.5rem 0rem;
+      border:1px solid #000000;
+    }
   }
+
+  .list {
+    list-style: none;
+    text-align: start;
+    font-size: 0.35rem;
+    line-height: 0.6rem;
+
+    .list__item-content {
+      font-size: 0.4rem;
+      line-height: 0.6rem;
+      word-break: break-all;
+      padding: 0.1rem 0.2rem;
+      text-align: left;
+    }
+  }
+}
 </style>
diff --git a/src/views/onlineHome/homestead/homeApplication/licensePermitEdit.vue b/src/views/onlineHome/homestead/certificate/licensePermitEdit.vue
similarity index 94%
rename from src/views/onlineHome/homestead/homeApplication/licensePermitEdit.vue
rename to src/views/onlineHome/homestead/certificate/licensePermitEdit.vue
index 1b6747eb..6a8bb46d 100644
--- a/src/views/onlineHome/homestead/homeApplication/licensePermitEdit.vue
+++ b/src/views/onlineHome/homestead/certificate/licensePermitEdit.vue
@@ -35,7 +35,7 @@
 
     <van-goods-action style="z-index: 999;">
         <van-goods-action-button type="info" text="关闭" @click="close()"/>
-        <van-goods-action-button type="primary" text="保存" @click="submit()"/>
+        <van-goods-action-button type="info" text="保存" @click="submit()"/>
     </van-goods-action>
   </div>
 </template>
@@ -137,5 +137,13 @@ export default {
 </script>
 
 <style scoped>
-
+.van-goods-action-button--first {
+  border-radius: 0.053333rem;
+}
+.van-goods-action-button--last {
+  border-radius: 0.053333rem;
+}
+.van-goods-action-button {
+  margin-left: 0.1rem;
+}
 </style>
diff --git a/src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue b/src/views/onlineHome/homestead/certificate/licenseRatificationEdit.vue
similarity index 96%
rename from src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue
rename to src/views/onlineHome/homestead/certificate/licenseRatificationEdit.vue
index 41b40542..f5c881cf 100644
--- a/src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue
+++ b/src/views/onlineHome/homestead/certificate/licenseRatificationEdit.vue
@@ -76,7 +76,7 @@
 
     <van-goods-action style="z-index: 999;">
         <van-goods-action-button type="info" text="关闭" @click="close()"/>
-        <van-goods-action-button type="primary" text="保存" @click="submit()"/>
+        <van-goods-action-button type="info" text="保存" @click="submit()"/>
     </van-goods-action>
   </div>
 </template>
@@ -186,4 +186,13 @@ export default {
   border-color: #1989fa;
   background-color: #FFFFFF;
 }
+.van-goods-action-button--first {
+  border-radius: 0.053333rem;
+}
+.van-goods-action-button--last {
+  border-radius: 0.053333rem;
+}
+.van-goods-action-button {
+  margin-left: 0.1rem;
+}
 </style>
diff --git a/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue b/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue
deleted file mode 100644
index fa490a87..00000000
--- a/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <div>
-    <van-nav-bar
-      left-arrow
-      title="公示查询"
-      fixed
-      placeholder
-      @click-left="$router.back()"
-    >
-      <template #right>
-        <van-icon name="@/../static/images/icon/icon_flow.png" size="20" @click="openFilter"/>
-      </template>
-    </van-nav-bar>
-
-    <van-search
-      v-model="queryParams.memberName"
-      placeholder="请输入姓名"
-      shape="round"
-      @search="getList(0)"
-    />
-
-    <van-pull-refresh v-model="refreshing" @refresh="getList()">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        :immediate-check="false"
-        finished-text="没有更多了"
-        @load="getList('+1')"
-      >
-        <van-swipe-cell v-for="(item,index) in list" :key="index" class="delegate">
-          <van-cell :title="item.projectName" center @click="viewItem(item)">
-            <template #icon>
-              <van-icon :name="{
-                '1': '@/../static/images/onlineHome/icon_zjd8.png',
-                '2': '@/../static/images/onlineHome/icon_zjd8.png',
-                '3': '@/../static/images/onlineHome/icon_zjd8.png',
-                '4': '@/../static/images/onlineHome/icon_zjd8.png',
-                }[item.announceStatus]" size="30" color="#539FFD" style="margin-right: 10px;" />
-            </template>
-            <template #label>
-              <p style="font-weight: bold;">{{formatDict(options.announce_type, item.announceType)}}&nbsp;&nbsp;&nbsp;&nbsp;{{item.startDate}} - {{item.endDate}}</p>
-            </template>
-            <template #title>
-              <p style="font-weight: bold;">{{item.projectName}}</p>
-            </template>
-            <template #right-icon>
-              <p :style="{'font-weight': 'bold',
-                color: {
-                  '1': '#000000',
-                  '2': '#0066FF',
-                  '3': 'orange',
-                  '4': '#33cc33',
-                }[item.announceStatus],
-              }">{{formatDict(options.announce_status, item.announceStatus)}}</p>
-            </template>
-          </van-cell>
-          <template #right>
-            <van-row style="height: 100%;">
-              <van-col style="height: 100%;">
-                <van-button square text="二维码" type="info" style="height: 100%;" @click="openQrCodePreview(item.id)"/>
-              </van-col>
-            </van-row>
-          </template>
-        </van-swipe-cell>
-      </van-list>
-    </van-pull-refresh>
-
-    <onlineHomeIndex :current="1"></onlineHomeIndex>
-
-    <van-popup
-      v-model="filterVisible"
-      closeable
-      position="top"
-      :close-on-click-overlay="true"
-      :lazy-render="false"
-    >
-      <van-form>
-        <van-cell title="筛选查询"></van-cell>
-        <field-select
-          v-model="queryParams.announceStatus"
-          label="公示状态"
-          value-key="dictLabel"
-          data-key="dictValue"
-          placeholder="公示状态筛选"
-          :columns="options.announce_status"
-        />
-        <field-select
-          v-model="queryParams.announceType"
-          label="公示类型"
-          value-key="dictLabel"
-          data-key="dictValue"
-          placeholder="公示类型筛选"
-          :columns="options.announce_type"
-        />
-        <field-date-picker
-          v-model="queryParams.startDate"
-          label="起始日期"
-          formatter="yyyy-MM-dd"
-          placeholder="起始日期"
-        />
-        <field-date-picker
-          v-model="queryParams.endDate"
-          label="结束日期"
-          formatter="yyyy-MM-dd"
-          placeholder="结束日期"
-        />
-        <div style="margin: 0.2rem; text-align: right;">
-          <van-button type="info" native-type="submit" size="small" @click="resetQuery"> 重置 </van-button>
-          <van-button type="primary" native-type="submit" size="small" @click="getList(0)"> 查询 </van-button>
-        </div>
-      </van-form>
-    </van-popup>
-  </div>
-</template>
-
-<script>
-import {listAnnounce, getProposer} from "@/api/onlineHome/homestead/houseAnnounce";
-import FieldSelect from "@/components/form/FieldSelect";
-import { formatDate } from "element-ui/src/utils/date-util.js"
-import { ImagePreview } from 'vant';
-import onlineHomeIndex from "@/views/onlineHomeIndex";
-import FieldDatePicker from "@/components/form/FieldDatePicker";
-
-export default {
-  components: {FieldSelect, onlineHomeIndex, FieldDatePicker},
-  name: "HouseAnnounce",
-  data() {
-    return {
-      list: [],
-      total: 0,
-      // ?pageNum=1&pageSize=10&orderByColumn=createTime&isAsc=desc&startDate=2022-04-13&endDate=2022-04-12&announceStatus=2
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        orderByColumn: 'createTime',
-        isAsc: 'desc',
-        startDate: '',
-        endDate: '',
-        announceStatus: null,
-        memberName: '',
-        announceType: null,
-      },
-      refreshing: false,
-      loading: false,
-      finished: false,
-      options: {
-        announce_status: [],
-        announce_type: [],
-      },
-      filterVisible: false,
-    }
-  },
-  created() {
-    this.initOptions();
-    this.getList();
-  },
-  methods: {
-    getList(target) {
-      let type = typeof (target);
-      console.log(type, target);
-      if (target === 0) {
-        this.refreshing = true;
-        this.finished = true;
-        this.total = 0;
-        this.queryParams.pageNum = 1;
-        this.list = [];
-        this.filterVisible = false;
-      }
-      else if (type === 'number')
-        this.queryParams.pageNum = target;
-      else if (type === 'string') {
-        this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
-      }
-      else
-      {
-        this.refreshing = true;
-        this.finished = true;
-        this.resetQuery();
-        this.total = 0;
-        this.queryParams.pageNum = 1;
-        this.list = []
-      }
-      listAnnounce(this.queryParams).then((response) => {
-        console.log(response)
-        if (response.rows.length === 0) {
-          this.finished = true;
-          return;
-        }
-        response.rows.forEach((e) => {
-          this.list.push(e);
-        });
-        this.total += response.rows.length;
-        this.finished = this.total >= response.total;
-      }).finally(() => {
-        this.loading = false;
-        this.refreshing = false;
-      });
-    },
-    viewItem(item) {
-      window.location = 'proposerLite?type=view&id=' + item.applyProposerId;
-    },
-    initOptions() {
-      for(let k in this.options)
-      {
-        this.houseGetDicts(k).then((res) => {
-          this.options[k] = res.data;
-        });
-      }
-    },
-    formatDict(dict, value) {
-      return this.selectDictLabel(dict, value);
-    },
-    openFilter() {
-      this.filterVisible = true;
-    },
-    onDatePickerConfirm(data) {
-      if(data)
-      {
-        this.queryParams.startDate = formatDate(data[0], 'yyyy-MM-dd');
-        this.queryParams.endDate = formatDate(data[1], 'yyyy-MM-dd');
-      }
-      else {
-        this.queryParams.startDate = '';
-        this.queryParams.endDate = '';
-      }
-    },
-    resetQuery() {
-      this.onDatePickerConfirm();
-      this.queryParams.announceStatus = null;
-      this.queryParams.announceType = null;
-    },
-    openQrCodePreview(id) {
-      getProposer(id).then((resp) => {
-        ImagePreview([this.$store.getters.baseRoutingUrl + resp.data.qrCodeUrl]);
-      }).catch((e) => {
-        this.$toast.fail('获取二维码失败!');
-      });
-    },
-  },
-}
-</script>
-
-<style scoped>
-.delegate {
-  width: 96%;
-  margin: 3% 2% 3% 2%;
-  border-radius: 0.18rem;
-  overflow: hidden;
-  box-shadow: 0.1rem 0.1rem 0.15rem 0.02rem rgba(0,0,0,0.16);
-}
-</style>
diff --git a/src/views/onlineHome/homestead/homeApplication/houseLicense.vue b/src/views/onlineHome/homestead/homeApplication/houseLicense.vue
deleted file mode 100644
index 922eaf79..00000000
--- a/src/views/onlineHome/homestead/homeApplication/houseLicense.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <div>
-    <van-nav-bar
-      left-arrow
-      title="证书查看"
-      fixed
-      placeholder
-      @click-left="$router.back()"
-    >
-      <template #right>
-        <van-icon name="@/../static/images/icon/icon_flow.png" size="20" @click="openFilter"/>
-      </template>
-    </van-nav-bar>
-
-    <van-pull-refresh v-model="refreshing" @refresh="getList()">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        :immediate-check="false"
-        finished-text="没有更多了"
-        @load="getList('+1')"
-      >
-        <van-swipe-cell v-for="(item,index) in list" :key="index" class="delegate">
-          <van-cell :label="item.idcard" center>
-            <template #icon>
-              <van-icon name="@/../static/images/onlineHome/icon_zjd7.png" size="30" color="#539FFD" style="margin-right: 10px;" />
-            </template>
-            <template #title>
-              <p style="font-weight: bold;">{{item.projectName}}</p>
-            </template>
-            <template #right-icon>
-              <van-button plain type="info" style="border: 0; font-weight: bold;" @click="openLicense(item)">查看证书</van-button>
-            </template>
-          </van-cell>
-          <template #right>
-            <van-row style="height: 100%;">
-              <van-col style="height: 100%;">
-                <van-button square text="查看申请" type="primary" style="height: 100%;" @click="viewItem(item)"/>
-              </van-col>
-              <van-col style="height: 100%;">
-                <van-button square text="许可证修改" type="info" style="height: 100%;" @click="editLicensePermit(item)"/>
-              </van-col>
-              <van-col style="height: 100%;">
-                <van-button square text="批准书修改" type="info" style="height: 100%;" @click="editLicenseRatification(item)"/>
-              </van-col>
-            </van-row>
-          </template>
-        </van-swipe-cell>
-      </van-list>
-    </van-pull-refresh>
-
-    <onlineHomeIndex :current="1"></onlineHomeIndex>
-
-    <van-popup
-      v-model="filterVisible"
-      closeable
-      position="top"
-      :close-on-click-overlay="true"
-      :lazy-render="false"
-    >
-      <van-form>
-        <van-cell title="筛选查询"></van-cell>
-        <van-field v-model="queryParams.memberName" label="申请户主" placeholder="申请户主" input-align="right"/>
-        <van-field v-model="queryParams.phone" label="联系电话" placeholder="联系电话" input-align="right"/>
-        <div style="margin: 0.2rem; text-align: right;">
-          <van-button type="info" native-type="submit" size="small" @click="resetQuery"> 重置 </van-button>
-          <van-button type="primary" native-type="submit" size="small" @click="getList(0)"> 查询 </van-button>
-        </div>
-      </van-form>
-    </van-popup>
-  </div>
-</template>
-
-<script>
-import {listProposer, getProposer} from "@/api/onlineHome/homestead/houseProposer";
-import FieldSelect from "@/components/form/FieldSelect";
-import { ImagePreview } from 'vant';
-import onlineHomeIndex from "@/views/onlineHomeIndex";
-
-export default {
-  components: {FieldSelect, onlineHomeIndex},
-  name: "HouseLicense",
-  data() {
-    return {
-      list: [],
-      total: 0,
-      // ?pageNum=1&pageSize=10&orderByColumn=createTime&isAsc=desc&printLicense=Y
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        printLicense: 'Y',
-        orderByColumn: 'createTime',
-        isAsc: 'desc',
-        phone: '',
-        memberName: '',
-      },
-      refreshing: false,
-      loading: false,
-      finished: false,
-      options: {
-      },
-      filterVisible: false,
-    }
-  },
-  created() {
-    this.initOptions();
-    this.getList();
-  },
-  methods: {
-    getList(target) {
-      let type = typeof (target);
-      console.log(type, target);
-      if (target === 0) {
-        this.refreshing = true;
-        this.finished = true;
-        this.total = 0;
-        this.queryParams.pageNum = 1;
-        this.list = [];
-        this.filterVisible = false;
-      }
-      else if (type === 'number')
-        this.queryParams.pageNum = target;
-      else if (type === 'string') {
-        this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
-      }
-      else
-      {
-        this.refreshing = true;
-        this.finished = true;
-        this.resetQuery();
-        this.total = 0;
-        this.queryParams.pageNum = 1;
-        this.list = []
-      }
-      listProposer(this.queryParams).then((response) => {
-        console.log(response)
-        if (response.rows.length === 0) {
-          this.finished = true;
-          return;
-        }
-        response.rows.forEach((e) => {
-          this.list.push(e);
-        });
-        this.total += response.rows.length;
-        this.finished = this.total >= response.total;
-      }).finally(() => {
-        this.loading = false;
-        this.refreshing = false;
-      });
-    },
-    viewItem(item) {
-      window.location = 'proposerLite?type=view&id=' + item.id;
-    },
-    initOptions() {
-      for(let k in this.options)
-      {
-        this.houseGetDicts(k).then((res) => {
-          this.options[k] = res.data;
-        });
-      }
-    },
-    formatDict(dict, value) {
-      return this.selectDictLabel(dict, value);
-    },
-    openFilter() {
-      this.filterVisible = true;
-    },
-    resetQuery() {
-      this.queryParams.phone = '';
-      this.queryParams.memberName = '';
-    },
-    openLicense(item) {
-      location.href = '/houseLicenseDetail?id=' + item.id;
-    },
-    editLicensePermit(item) {
-      window.location = 'licensePermitEdit?id=' + item.id;
-    },
-    editLicenseRatification(item) {
-      window.location = 'licenseRatificationEdit?id=' + item.id;
-    },
-  },
-}
-</script>
-
-<style scoped>
-.delegate {
-  width: 96%;
-  margin: 3% 2% 3% 2%;
-  border-radius: 0.18rem;
-  overflow: hidden;
-  box-shadow: 0.1rem 0.1rem 0.15rem 0.02rem rgba(0,0,0,0.16);
-}
-</style>
diff --git a/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue b/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue
deleted file mode 100644
index ef68b3c1..00000000
--- a/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue
+++ /dev/null
@@ -1,395 +0,0 @@
-<template>
-  <div>
-    <van-nav-bar
-      left-arrow
-      title="证书查看"
-      fixed
-      placeholder
-      @click-left="$router.back()"
-    >
-    </van-nav-bar>
-
-
-    <van-tabs color="#1D6FE9" :lazy-render="false" v-model="activeName">
-      <van-tab title="规划许可证" key="0">
-        <div class="planningPermit-wrap wrap-root">
-          <div class="planningPermit-first">
-            <div class="permit-main section">
-              <div class="details_first_main part">
-                <div class="details_first_title title">中华人民共和国</div>
-                <div class="details_first_title title">乡村建设规划许可证</div>
-                <div class="details_first_page no-label">乡字第 <i class="no">{{this.licenseForm.licensePermit.licenseKey}}</i> 号</div>
-                <div class="details_first_cont content">根据《中华人民共和国土地管理法》《中华人民共和国城乡规划法》和国家有关规定，经审核，本建设工程符合国土空间规划和用途管制要求，颁发此证。</div>
-                <div class="licence_first_jg label" style="padding-top: 3.5rem;">填发机关:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licensePermit.issuingAuthority}}</div>
-                <div class="licence_first_time label">日 期:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licensePermit.issueDate}}</div>
-              </div>
-            </div>
-
-            <div class="details_page section">
-              <div class="details_page_main part">
-                <table>
-                  <tr>
-                    <td style="width: 2.6rem;">建设单位(个人)</td> <td >{{this.licenseForm.licensePermit.constructionUnit}}</td>
-                  </tr>
-                  <tr>
-                    <td>建设项目名称</td> <td>{{this.licenseForm.licensePermit.constructionUnit}}</td>
-                  </tr>
-                  <tr>
-                    <td>建设位置</td> <td>{{this.licenseForm.licensePermit.constructionLocation}}</td>
-                  </tr>
-                  <tr>
-                    <td>建设规模</td> <td>{{ this.licenseForm.licensePermit.constructionScale }}</td>
-                  </tr>
-                  <!--                <tr>
-                                    <td>{{ this.licenseForm.licenseRatification.west }}</td><td>{{ this.licenseForm.licenseRatification.north }}</td>
-                                  </tr>-->
-                  <tr>
-                    <td>附图及附件名称</td>
-                    <td>
-                      <ul class="list">
-                        <li v-for="file in attachmentList" class="list__item-content">
-                          {{file.fileName}}
-                        </li>
-                      </ul>
-                    </td>
-                  </tr>
-                </table>
-                <div class="details_first_title title" style="text-align: left; padding-top: 0.2rem; padding-bottom: 0.2rem; font-size: 0.52rem; line-height: 0.8rem;">遵守事项</div>
-                <ul class="list" style="padding: 0.1rem 0.1rem; font-size: 0.35rem; line-height: 0.6rem;">
-                  <li>一、 本证是经自然资源主管部门依法审核，在乡、村庄规划区内有关建设工程符合国土空间规划和用途管制要求的法律凭证。</li>
-                  <li>二、 依法应当取得本证，但未取得本证或违反本证规定的，均属违法行为。</li>
-                  <li>三、 未经发证机关审核同意，本证的各项规定不得随意变更。</li>
-                  <li>四、 自然资源主管部门依法有权查验本证，建设单位（个人）有责任提交查验。</li>
-                  <li>五、 本证所需附图及附件由发证机关依法确定，与本证具有同等法律效力。</li>
-                </ul>
-              </div>
-            </div>
-          </div>
-
-          <div class="planningPermit-two" style="display: block; overflow: hidden;">
-            <div class="details_page">
-              <table>
-                <tr>
-                  <td style="width: 1rem; height: 12rem;">宅<br />基<br />地<br />坐<br />落<br />平<br />面<br />位<br />置<br />图</td>
-                  <td>
-                    <RawImageCarousel :images="locationPlanList" url-label="url" name-label="fileName" style="width: 100%; height: 100%;" v-if="locationPlanList.length > 0"></RawImageCarousel>
-                  </td>
-                </tr>
-                <tr>
-                  <td>备注</td>
-                  <td>图中需载明宅基地的具体位置、长宽、四至，并标明与永久性参照物的具体距离。</td>
-                </tr>
-              </table>
-              <ul class="list" style="padding: 0.6rem 0.1rem 0.1rem; width: 92%; margin:0 auto;">
-                <li>填写说明：</li>
-                <li>1.编号规则:编号数字共16位，前6位数字按照《中华人民共和国行政区划代码》（详见民政部网站www.mca.gov.cn）执行；7-9位数字表示街道（地区）办事处、镇、乡（苏木），按GB/T10114的规定执行；10-13位数字代表证书发放年份；14-16位数字代表证书发放序号。</li>
-                <li>2.批准书有效期:指按照本省（区、市）宅基地管理有关规定，宅基地申请批准后农户必须开工建设的时间。</li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </van-tab>
-
-      <van-tab title="宅基地批准书" key="1">
-        <div class="licenceAround-wrap wrap-root">
-          <div class="licence_first_page section" style="padding-top: 0.5rem;">
-            <div class="details_first_title title">农村宅基地批准书</div>
-            <div class="number-title no-sub-label" >
-              农宅字 <i class="no">{{this.licenseForm.licenseRatification.approvalNumber}}</i>号
-            </div>
-            <div class="licence_first_main" style="border:1px solid #000000;  padding: 2rem 0.4rem;">
-              <div class="content">
-                根据《中华人民共和国土地管理法》规定，本项农村村民宅基地用地  业经有权机关批准，特发此书。
-                请严格按照本批准书要求使用宅基地。
-              </div>
-              <div class="ft_jg label" style="padding-top: 2.5rem;">填发机关:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licenseRatification.issuingAuthority}}</div>
-              <div class="ft_time label">填发时间:&nbsp;&nbsp;&nbsp;{{this.licenseForm.licenseRatification.issueDate}}</div>
-            </div>
-          </div>
-
-          <div class="licence_two_page section" style="margin-top: 0.5rem;">
-            <div class="details_first_title title">农村宅基地批准书（存根）</div>
-              <div class="number-title no-sub-label">
-                              农宅字 <i class="no">{{this.licenseForm.licenseRatification.approvalNumber}}</i> 号
-              </div>
-              <div class="licence_two_main">
-                <table>
-                  <tr>
-                    <td style="width: 2.6rem;">申请人姓名</td> <td colspan="8">{{this.licenseForm.licenseRatification.memberName}}</td>
-                  </tr>
-                  <tr>
-                    <td>批准用地面积</td> <td colspan="8">{{this.licenseForm.licenseRatification.landArea}} 平方米</td>
-                  </tr>
-                  <tr>
-                    <td>其中：房基占地</td> <td colspan="8">{{this.licenseForm.licenseRatification.fjzdmj}} 平方米</td>
-                  </tr>
-                  <tr>
-                    <td>土地所有权人</td> <td colspan="8">{{this.licenseForm.licenseRatification.landOwner}}</td>
-                  </tr>
-                  <tr>
-                    <td>土地用途</td> <td colspan="8">{{ formatDict(options.land_use, licenseForm.licenseRatification.landUse) }}</td>
-                  </tr>
-                  <tr>
-                    <td>土地坐落<br/>(详见附图)</td> <td colspan="8">{{ this.licenseForm.licenseRatification.location }}</td>
-                  </tr>
-                  <tr>
-                    <td rowspan="2">四  至</td>
-                    <td style="width: 1.2rem;">东</td><td colspan="3">{{ this.licenseForm.licenseRatification.east }}</td>
-                    <td style="width: 1.2rem;">南</td><td colspan="3">{{ this.licenseForm.licenseRatification.south }}</td>
-                  </tr>
-                  <tr>
-                    <td style="width: 1.2rem;">西</td><td colspan="3">{{ this.licenseForm.licenseRatification.west }}</td>
-                    <td style="width: 1.2rem;">北</td><td colspan="3">{{ this.licenseForm.licenseRatification.north }}</td>
-                  </tr>
-                  <tr>
-                    <td>批准书有效期</td><td colspan="8">{{this.licenseForm.licenseRatification.startTime +'至'+this.licenseForm.licenseRatification.endTime }}</td>
-                  </tr>
-                  <tr style="height: 2rem;" >
-                    <td colspan="9" style="text-align: left;">备注:</td>
-                  </tr>
-                </table>
-              </div>
-            </div>
-
-          <div class="licence_three_page section" style="margin-top: 0.5rem;">
-            <div  class="number-title no-sub-label">
-              农宅字 <i class="no">{{this.licenseForm.licenseRatification.approvalNumber}}</i> 号
-            </div>
-            <table>
-              <tr>
-                <td style="width: 2.6rem;">申请人姓名</td> <td colspan="8">{{this.licenseForm.licenseRatification.memberName}}</td>
-              </tr>
-              <tr>
-                <td>批准用地面积</td> <td colspan="8">{{this.licenseForm.licenseRatification.landArea}} 平方米</td>
-              </tr>
-              <tr>
-                <td>房基占地面积</td> <td colspan="8">{{this.licenseForm.licenseRatification.fjzdmj}} 平方米</td>
-              </tr>
-              <tr>
-                <td>土地所有权人</td> <td colspan="8">{{this.licenseForm.licenseRatification.landOwner}}</td>
-              </tr>
-              <tr>
-                <td>土地用途</td> <td colspan="8">{{ formatDict(options.land_use, licenseForm.licenseRatification.landUse) }} </td>
-              </tr>
-              <tr>
-                <td>土地坐落<br/>(详见附图)</td> <td  colspan="8">{{ this.licenseForm.licenseRatification.location }}</td>
-              </tr>
-              <tr>
-                <td rowspan="2">四  至</td>
-                <td style="width: 1.2rem;">东</td><td colspan="3">{{ this.licenseForm.licenseRatification.east }}</td>
-                <td style="width: 1.2rem;">南</td><td colspan="3">{{ this.licenseForm.licenseRatification.south }}</td>
-              </tr>
-              <tr>
-                <td style="width: 1.2rem;">西</td><td colspan="3">{{ this.licenseForm.licenseRatification.west }}</td>
-                <td style="width: 1.2rem;">北</td><td colspan="3">{{ this.licenseForm.licenseRatification.north }}</td>
-              </tr>
-              <tr>
-                <td>批准书有效期</td><td colspan="8">{{this.licenseForm.licenseRatification.startTime +'至'+this.licenseForm.licenseRatification.endTime }}</td>
-              </tr>
-              <tr style="height: 2rem;">
-                <td colspan="9" style="text-align: left;">备注:</td>
-              </tr>
-            </table>
-          </div>
-        </div>
-      </van-tab>
-    </van-tabs>
-
-    <onlineHomeIndex :current="1"></onlineHomeIndex>
-  </div>
-</template>
-
-<script>
-import {selectAllLicense} from "@/api/onlineHome/homestead/houseProposer";
-import onlineHomeIndex from "@/views/onlineHomeIndex";
-import { attachmentFind } from "@/api/onlineHome/homestead/application";
-import RawImageCarousel from "@/components/house/RawImageCarousel";
-
-export default {
-  components: {onlineHomeIndex, RawImageCarousel},
-  name: "HouseLicenseDetail",
-  data() {
-    return {
-      proposerId: null,
-      licenseForm:{
-        "licensePermit": {
-          "searchValue": null,
-          "createBy": "",
-          "createTime": "",
-          "updateBy": "",
-          "updateTime": null,
-          "proposerId": null,
-          "applyProposerId": null,
-          "year": "",
-          "licenseKey": "",
-          "issuingAuthority": "",
-          "issueDate": "",
-          "constructionUnit": "",
-          "constructionItem": "",
-          "constructionLocation": "",
-          "constructionScale": "",
-          "locationPlan": null
-        },
-        "licenseRatification": {
-          "searchValue": null,
-          "createBy": "",
-          "createTime": '',
-          "updateBy": "",
-          "updateTime": null,
-          "proposerId": '',
-          "applyProposerId": '',
-          "year": "2021",
-          "approvalNumber": "",
-          "issuingAuthority": "",
-          "issueDate": "",
-          "memberName": "",
-          "landArea": 0,
-          "landOwner": "",
-          "landUse": "",
-          "location": "",
-          "east": "",
-          "west": "",
-          "south": "",
-          "north": "",
-          "startTime": "",
-          "endTime": "",
-          "remark": '',
-          'fjzdmj': 0, // 房基占地面积
-        },
-      },
-      activeName: 0,
-      options: {
-        land_use: [],
-      },
-      attachmentList: [],
-      locationPlanList: [],
-    }
-  },
-  created() {
-    this.proposerId = this.$route.query.id;
-    this.initOptions();
-    this.getDetail();
-  },
-  methods: {
-    getDetail() {
-      selectAllLicense(this.proposerId).then((response) => {
-        this.licenseForm = response.data;
-        if(this.licenseForm.licensePermit.locationPlan)
-        {
-          const Host = this.$store.getters.baseRoutingUrl;
-          let list = JSON.parse(this.licenseForm.licensePermit.locationPlan);
-          this.locationPlanList = list.map((x) => {
-            x.url = Host + x.fileUrl;
-            return x;
-          })
-        }
-        this.getAttachments();
-      }).catch((e) => {
-        this.$toast.fail('获取证书失败!');
-      });
-    },
-    initOptions() {
-      for(let k in this.options)
-      {
-        this.houseGetDicts(k).then((res) => {
-          this.options[k] = res.data;
-        });
-      }
-    },
-    formatDict(dict, value) {
-      return this.selectDictLabel(dict, value);
-    },
-    getAttachments() {
-      this.attachmentList = [];
-      let cond = {
-        tableId: this.proposerId,
-        tableName: 't_house_apply_proposer',
-        fileType: 13,
-      };
-      attachmentFind(cond).then(resp => {
-        this.attachmentList = resp.data;
-      });
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-table {
-  line-height: 2rem;
-  text-align: center;
-  border-collapse: collapse;
-  width: 96%;
-  margin: 0 auto;
-}
-td {
-  line-height: 1rem;
-  border: 1px solid #000000;
-  border-collapse: collapse;
-  font-size: 0.35rem;
-}
-.planningPermit-two{
-  //margin-top: 30px;
-}
-.wrap-root {
-  color: #606266;
-  .title {
-    font-size: 0.55rem;
-    font-weight: bold;
-    text-align: center;
-    line-height: 0.8rem;
-  }
-  .no-label {
-    text-align: right;
-    font-size: 0.45rem;
-    line-height: 0.6rem;
-    padding: 0.5rem 0 0.5rem;
-  }
-  .no-sub-label {
-    text-align: right;
-    font-size: 0.4rem;
-    line-height: 0.5rem;
-    padding: 0.2rem 0.1rem 0.2rem;
-  }
-  .no {
-    text-decoration: underline;
-    font-style:oblique;
-  }
-  .content {
-    font-size: 0.45rem;
-    line-height: 0.8rem;
-  }
-  .label {
-    font-size: 0.45rem;
-    text-align: right;
-    line-height: 0.8rem;
-    padding-right: 0.3rem;
-  }
-
-  .section {
-    width: 96%;
-    margin: auto;
-    .part {
-      width: 100%;
-      padding: 1.5rem 0.35rem;
-      margin: 0.5rem 0rem;
-      border:1px solid #000000;
-    }
-  }
-
-  .list {
-    list-style: none;
-    text-align: start;
-    font-size: 0.35rem;
-    line-height: 0.6rem;
-
-    .list__item-content {
-      font-size: 0.4rem;
-      line-height: 0.6rem;
-      word-break: break-all;
-      padding: 0.1rem 0.2rem;
-      text-align: left;
-    }
-  }
-}
-</style>