Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -60,26 +60,6 @@ class business {
       data
     })
   }
-
-
-
-
-  // 抵押权登记
-  async getQlfQlDyaqByCondition (data) {
-    return request({
-      url: SERVER.SERVERAPI +'/rest/reg/QlfQlDyaq/getDataPage',
-      method: 'post',
-      data
-    })
-  }
-  // 查封登记信息
-  async getQlfQlCfdjByCondtion (data) {
-    return request({
-      url: SERVER.SERVERAPI +'/rest/reg/QlfQlCfdj/getDataPage',
-      method: 'post',
-      data
-    })
-  }
   // 构（建）筑物所有权
   async getQltQlGjzwsyqByCondition (data) {
     return request({
@@ -113,7 +93,7 @@ class business {
     })
   }
   // 异议登记信息
-  async getQlfQlYydjByCondition (data) {
+  async getQlfQlYydjList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlYydj/getDataPage',
       method: 'post',
@@ -121,13 +101,33 @@ class business {
     })
   }
   // 预告登记信息
-  async getQlfQlYgdjByCondition (data) {
+  async getQlfQlYgdjList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlYgdj/getDataPage',
       method: 'post',
       data
     })
   }
+  // 查封登记信息
+  async getQlfQlCfdjList (data) {
+    return request({
+      url: SERVER.SERVERAPI +'/rest/reg/QlfQlCfdj/getDataPage',
+      method: 'post',
+      data
+    })
+  }
+
+
+
+  // 抵押权登记
+  async getQlfQlDyaqByCondition (data) {
+    return request({
+      url: SERVER.SERVERAPI +'/rest/reg/QlfQlDyaq/getDataPage',
+      method: 'post',
+      data
+    })
+  }
+
   // 地役权
   async getQlfQlDyiqByCondtion (data) {
     return request({
@@ -194,7 +194,7 @@ class business {
   //登记发证信息
   async getDjfDjFzDetailById (bsmSjsb) {
     return request({                   
-      url: SERVER.SERVERAPI +'/rest/reg/djfDjFz/detail',
+      url: SERVER.SERVERAPI +'/rest/reg/DjfDjFz/detail',
       method: 'get',
       params: {
         bsmSjsb: bsmSjsb
@@ -204,7 +204,7 @@ class business {
   //修改登记发证信息
   async updateDjfDjFz (data) {
     return request({
-      url: SERVER.SERVERAPI +'/rest/reg/djfDjFz/edit',
+      url: SERVER.SERVERAPI +'/rest/reg/DjfDjFz/edit',
       method: 'post',
       data
     })

 import request from '@/utils/request'
-
+import SERVER from './config'
 class ruleConfig {
   // 列表查询
   async getSysYwsjbList (data) {
     return request({
-      url: '/SysYwsjb/getSysYwsjbList',
+      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/getSysYwsjbList',
       method: 'post',
       data
     })
@@ -12,7 +12,7 @@ class ruleConfig {
   // 编辑界面列表查询
   async eidtConfigRule (id) {
     return request({
-      url: '/SysYwsjb/getSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
+      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/getSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
       method: 'get',
       params: {
         bsmYwsjb: id
@@ -22,7 +22,7 @@ class ruleConfig {
   // 编辑
   async editSysYwsjbWithSysYwsjbField (data) {
     return request({
-      url: '/SysYwsjb/editSysYwsjbWithSysYwsjbField',
+      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/editSysYwsjbWithSysYwsjbField',
       method: 'post',
       data
     })
@@ -30,7 +30,7 @@ class ruleConfig {
   // 编辑
   async deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb (id) {
     return request({
-      url: '/SysYwsjb/deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
+      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
       method: 'delete',
       params: {
         bsmYwsjb: id
@@ -40,7 +40,7 @@ class ruleConfig {
   // 编辑界面列表查询----根据数据表名查询
   async getRuleList (bsmYwsjb) {
     return request({
-      url: '/sjsb/DataReport/getTableColumn',
+      url:  SERVER.SERVERAPI +'/rest/sjsb/DataReport/getTableColumn',
       method: 'get',
       params: {
         bsmYwsjb: bsmYwsjb

@@ -395,7 +395,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlYgdjById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -359,7 +359,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlNydsyqByID(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -178,7 +178,7 @@ export default {
       try {
         let { result: res } = await business.getDjfDjGdById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -192,7 +192,7 @@ export default {
       try {
         let { result: res } = await business.getKttGyJzxById(this.bsmSjsb)
         this.boundaryLine.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -161,7 +161,7 @@ export default {
       try {
         let { result: res } = await business.getKttGyJzdById(this.bsmSjsb)
         this.boundaryPoint.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -346,7 +346,7 @@ export default {
       try {
         let { result: res } = await business.getQltQlGjzwsyqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -162,7 +162,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlZxdjById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -152,9 +152,8 @@ export default {
     async featchData () {
       try {
         let { result: res } = await business.getDjfDjSzById(this.bsmSjsb)
-        this.certificateInfo.ruleForm = res
-        console.log(this.certificateInfo.ruleForm)
-        this.featchRule()
+        this.certificateInfo.ruleForm = res;
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -103,7 +103,7 @@ export default {
       try {
         let { result: res } = await business.getZhK105ById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -228,7 +228,7 @@ export default {
       try {
         let { result: res } = await business.getDjfDjFzDetailById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -211,7 +211,7 @@ export default {
       try {
         let { result: res } = await business.getDjfDjShById(this.bsmSjsb)
         this.form.auditInfo = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -372,7 +372,7 @@ export default {
       try {
         let { result: res } = await business.getDjfDjSqrById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -284,7 +284,7 @@ export default {
       try {
         let { result: res } = await business.getDjtDjSlsqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -343,7 +343,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlDyiqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -389,7 +389,7 @@ export default {
       try {
         let { result: res } = await business.getQltQlLqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -203,7 +203,7 @@ export default {
       try {
         let { result: res } = await business.getKttFwCById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -512,7 +512,7 @@ export default {
       try {
         let { result: res } = await business.getKttFwHById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -94,7 +94,7 @@ export default {
       try {
         let { result: res } = await business.getKtfZhYhydzbById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -277,7 +277,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlJsydsyqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -309,7 +309,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlTdsyqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -169,7 +169,7 @@ export default {
       try {
         let { result: res } = await business.getKtfQtXzdzwById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -311,7 +311,7 @@ export default {
       try {
         let { result: res } = await business.getKttFwLjzById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -222,7 +222,7 @@ export default {
       try {
         let { result: res } = await business.getQlfFwFdcqQfsyqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -314,7 +314,7 @@ export default {
       try {
         let { result: res } = await business.getQltFwFdcqDzById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+       // this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -170,7 +170,7 @@ export default {
       try {
         let { result: res } = await business.getQlfFwFdcqDzXmById(this.bsmSjsb)
         this.ruleForm.itemList = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -375,7 +375,7 @@ export default {
       try {
         let { result: res } = await business.getKttFwZrzById(this.bsmSjsb)
         this.naturalForm.naturalList = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -214,7 +214,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlYydjById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -347,7 +347,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlQtxgqlById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -500,7 +500,7 @@ export default {
       try {
         let { result: res } = await business.kttZdjbxxDetail(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -114,7 +114,7 @@ export default {
       try {
         let { result: res } = await business.getKtfZdbhqkById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -94,7 +94,7 @@ export default {
       try {
         let { result: res } = await business.getZdK103ById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -168,7 +168,7 @@ export default {
       try {
         let { result: res } = await business.getKtfQtMzdzwById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -168,7 +168,7 @@ export default {
       try {
         let { result: res } = await business.getKtfQtDzdzwById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -327,7 +327,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlDyaqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -207,7 +207,7 @@ export default {
       try {
         let { result: res } = await business.getDjfDjSjById(this.bsmSjsb)
         this.form.receivingInfo = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -246,7 +246,7 @@ export default {
       try {
         let { result: res } = await business.getDjfDjSfById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -180,7 +180,7 @@ export default {
       try {
         let { result: res } = await business.getDjfDjGdById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -306,7 +306,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlHysyqById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -92,7 +92,7 @@ export default {
       try {
         let { result: res } = await business.getZhK105ById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -106,7 +106,7 @@ export default {
       try {
         let { result: res } = await business.getKtfZhYhzkById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -314,7 +314,7 @@ export default {
       try {
         let { result: res } = await business.getQlfQlCfdjById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -405,7 +405,7 @@ export default {
       try {
         let { result: res } = await business.getQltFwFdcqYzById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -159,7 +159,7 @@ export default {
       try {
         let { result: res } = await business.getKttGzwById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -66,7 +66,7 @@ export default {
       try {
         let { result: res } = await business.getFjF100ById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -436,7 +436,7 @@ export default {
       try {
         let { result: res } = await business.getKttZhjbxxById(this.bsmSjsb)
         this.ruleForm = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -378,7 +378,7 @@ export default {
       try {
         let { result: res } = await business.getZttGyQlrById(this.bsmSjsb)
         this.obligeeForm.obligeeList = res
-        this.featchRule()
+        //this.featchRule()
       } catch (error) {
         this.$refs.msg.messageShow()
       }

@@ -215,49 +215,49 @@ export const asyncRoutes = [
         path: 'seaArea',
         component: () => import('@/views/business-info/sea-area/index'),
         name: 'seaArea',
-        meta: { title: ' 海域(含无居民海岛)使用权' }
+        meta: { title: '海域(含无居民海岛)使用权' }
       },
       {
         path: 'buildingOwnership',
         component: () => import('@/views/business-info/building-ownership/index'),
         name: 'buildingOwnership',
-        meta: { title: ' 构（建）筑物所有权' }
+        meta: { title: '构（建）筑物所有权' }
       },
       {
         path: 'agriculturalLand',
         component: () => import('@/views/business-info/agricultural-land/index'),
         name: 'agriculturalLand',
-        meta: { title: ' 农用地使用权（非林地）' }
+        meta: { title: '农用地使用权（非林地）' }
       },
       {
         path: 'forestOwnership',
         component: () => import('@/views/business-info/forest-ownership/index'),
         name: 'forestOwnership',
-        meta: { title: ' 林权' }
+        meta: { title: '林权' }
       },
       {
         path: 'cancellationReg',
         component: () => import('@/views/business-info/cancellation-registration/index'),
         name: 'cancellationReg',
-        meta: { title: ' 注销登记' }
+        meta: { title: '注销登记' }
       },
       {
-        path: 'objectionReg',
-        component: () => import('@/views/business-info/objection-registration/index'),
-        name: 'objectionReg',
-        meta: { title: ' 异议登记' }
+        path: 'yydj',
+        component: () => import('@/views/business-info/yydj/index'),
+        name: 'yydj',
+        meta: { title: '异议登记' }
       },
       {
-        path: 'noticeReg',
-        component: () => import('@/views/business-info/notice-registration/index'),
-        name: 'noticeReg',
-        meta: { title: ' 预告登记' }
+        path: 'ygdj',
+        component: () => import('@/views/business-info/ygdj/index'),
+        name: 'ygdj',
+        meta: { title: '预告登记' }
       },
       {
-        path: 'seizureReg',
-        component: () => import('@/views/business-info/seizure-registration/index'),
-        name: 'seizureReg',
-        meta: { title: ' 查封登记' }
+        path: 'Cfdj',
+        component: () => import('@/views/business-info/Cfdj/index'),
+        name: 'Cfdj',
+        meta: { title: '查封登记' }
       },
       {
         path: 'mortgageReg',

@@ -7,21 +7,21 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       {
         label: "不动产单元号",
-        prop: "BDCDYH"
+        prop: "bdcdyh"
       },
       {
         label: "查封文号",
-        prop: "CFWH",
+        prop: "cfwh",
         width: 150
       },
       {
         label: "查封机关",
-        prop: "CFJG"
+        prop: "cfjg"
       },
       {
         label: "查封开始时间",

 <template>
-  <div class="seizureReg from-clues">
+  <div class="Cfdj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -55,7 +55,7 @@ import dataReporting from '@/api/dataReporting'
 import tableMixin from '@/mixins/tableMixin.js'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "seizureReg",
+  name: "Cfdj",
   mixins: [tableMixin],
   components: {
     editDialog
@@ -124,7 +124,7 @@ export default {
     async featchData () {
       try {
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlCfdjByCondtion(this.form)
+        } = await business.getQlfQlCfdjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

 <template>
-  <div class="noticeReg from-clues">
+  <div class="ygdj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号">
+            <el-form-item label="业务号6">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>
@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "noticeReg",
+  name: "ygdj",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -147,9 +147,8 @@ export default {
     },
     async featchData () {
       try {
-        this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlYgdjByCondition(this.form)
+        } = await business.getQlfQlYgdjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -7,20 +7,20 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       {
         label: "不动产单元号",
-        prop: "BDCDYH"
+        prop: "bdcdyh"
       },
       {
         label: "异议事项",
-        prop: "YYSX"
+        prop: "yysx"
       },
       {
         label: "不动产登记证明号",
-        prop: "BDCDJZMH"
+        prop: "bdcdjzmh"
       },
       {
         label: "登记时间",

 <template>
-  <div class="objectionReg from-clues">
+  <div class="yydj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "objectionReg",
+  name: "yydj",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -132,7 +132,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlYydjByCondition(this.form)
+        } = await business.getQlfQlYydjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,