Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
7f96a1f6 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 8324edc9 7fd064d0
Inline Side-by-side
Showing 11 changed files with 100 additions and 54 deletions
......@@ -2,7 +2,7 @@
<div class="temp">
<table class="tempTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<td colspan="2" width="50px">权利</td>
<td colspan="2" width="50px"><span class="table-title">权利人信息</span></td>
<td colspan="2">共有方式</td>
<td colspan="8">
<el-row>
......@@ -567,6 +567,10 @@
padding: 10px 0;
}
}
.table-title{
font-weight: 700;
font-size: 15px;
}
.el-table th {
background-color: #fff !important;
}
......
......@@ -38,6 +38,10 @@ let bdcLxArray = [
value: "h1",
},
{
label: "户",
value: "h",
},
{
label: "多幢",
value: "dz",
},
......
......@@ -30,12 +30,6 @@ const constantRoutes = [
component: () => import("@/views/panel/index"),
},
{
path: "/create",
name: "新建",
code: "0-2",
component: () => import("@/views/panel/create/index"),
},
{
path: "/add",
name: "添加",
code: "0-6",
......@@ -77,12 +71,6 @@ const constantRoutes = [
code: "1-5",
component: () => import("@/views/zd/index"),
},
{
path: "/c",
name: "层",
code: "1-7",
component: () => import("@/views/zrz/c/index"),
},
],
},
];
......
......@@ -204,7 +204,24 @@ export default {
// this.sortNavigation(this.navigationList, indId);
// }
this.getDic();
//刷新页面后根据不同路由获取不同树结构数据
if(this.$route.path == '/zrz'){
this.getRightTreeByZrzbsm(this.$store.state.zrzbsm)
}else if(this.$route.path == '/zd'){
this.getRightTree(this.$store.state.zdbsm)
}else{
this.getTreeList();
}
//刷新页面后根据不同路由高亮相对应的导航
if(this.$route.path == '/zrz' || this.$route.path == '/zd' || this.$route.path == '/dz'){
}else{
this.headTop.forEach(item=>{
if (item.path == this.$route.path) {
item.select = true;
}
})
}
this.$nextTick(()=>{
this.treeHeight = this.$el.clientHeight - 120;
});
......
......@@ -93,8 +93,8 @@
<el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
规划用途
</td>
<td colspan="4" align="center" >
<el-select-tree class="formInput"
<td colspan="3" align="center" >
<el-select-tree style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -107,9 +107,9 @@
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td colspan="1" align="center" >用途</td>
<td colspan="4" align="center" >
<el-select-tree class="formInput"
<td colspan="2" align="center" >用途</td>
<td colspan="4">
<el-select-tree style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -189,7 +189,7 @@
<span>审查日期</span>
</td>
<td colspan="2" >
<el-date-picker
<el-date-picker style="width:100%"
v-model="form.date"
type="date"
placeholder="选择日期">
......@@ -478,12 +478,9 @@
</script>
<style rel="stylesheet/less" lang="less" scoped>
.dz {
min-height: 200px;
width: 80%;
margin-top: 10px;
margin-left: 10%;
float: left;
box-sizing: border-box;
padding: 18px;
padding-bottom: 0;
/deep/.el-input__inner{
width: 100%;
border: 0;
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
</el-tabs>
</div>
......
......@@ -4,7 +4,7 @@
<el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -25,6 +25,7 @@ export default {
activeName: "fg",
hbLoad:false, //默认不加载合并tab
fwsxbgLoad:false, //默认不加载范围属性变更tab
cxlzLoad:false, //默认不加载重新落宗tab
};
},
methods: {
......@@ -36,6 +37,9 @@ export default {
if(!this.fwsxbgLoad){
this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
}
if(!this.cxlzLoad){
this.cxlzLoad = tab.name == 'cxlz' ? true : false
}
},
},
created() {},
......
......@@ -145,6 +145,7 @@
this.$store.state.dzbsm = row.glbsm;
path = "/dz";
break;
case "h":
case "h0":
case "h1":
this.hbsm = row.glbsm;
......
......@@ -411,6 +411,8 @@ export default {
{ label: "-", value: "-" },
],
formData: {},
dpdm:'', //宗地底盘代码
};
},
created() {
......@@ -463,6 +465,34 @@ export default {
.catch((error) => {});
},
//构造底盘代码,前6位是xzqbsm，接着3位djqbsm，3位djzqbsm，最后2位是syqlxbsm 860101555888GB
generatorDpdm() {
this.$store.state.xzqList.forEach((item)=>{
if(item.bsm === this.formData.xzqbsm){
this.dpdm = item.dm;
}
});
this.$store.state.djqList.forEach((item)=>{
if(item.bsm === this.formData.djqbsm){
this.dpdm = this.dpdm + item.dm;
}
});
this.$store.state.djzqList.forEach((item)=>{
if(item.bsm === this.formData.djzqbsm){
this.dpdm = this.dpdm + item.dm;
}
});
console.log(this.formData.syqlxbsm);
this.dpdm = this.dpdm + this.formData.syqlxbsm;
this.$store.state.zdtzmList.forEach((item)=>{
if(item.zdtzmbsm === this.formData.zdtzmbsm){
this.dpdm = this.dpdm + item.dm;
}
});
console.log(this.dpdm)
},
//不动产单元号再次生成提示框
open() {
this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
......@@ -470,7 +500,8 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
getBdcdyh("860101555888GB", "zd")
this.generatorDpdm();
getBdcdyh(this.dpdm, "zd")
.then((res) => {
console.log(res);
this.formData.zddm = res.result.substring(0, 19);
......@@ -496,9 +527,9 @@ export default {
this.open();
return;
}
this.generatorDpdm();
//前6位是xzqbsm，接着3位djqbsm，3位djzqbsm，最后2位是syqlxbsm 860101555888GB
getBdcdyh("860101555888GB", "zd")
getBdcdyh(this.dpdm, "zd")
.then((res) => {
console.log(res);
this.formData.zddm = res.result.substring(0, 19);
......
......@@ -8,21 +8,21 @@
<td colspan="12" align="center" ><font size="4">户基本信息</font></td>
</tr>
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="2" align="center" >宗地代码<i class="requisite">*</i></td>
<td colspan="4" >
<el-input v-model="form.zddm" disabled></el-input>
</td>
<td colspan="2" align="center" >自然幢号</td>
<td colspan="2" align="center" >自然幢号<i class="requisite">*</i></td>
<td colspan="4" >
<el-input v-model="form.zrzh" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
<!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
<td colspan="4" >
<el-input v-model="form.bdcdyh" style="width: 70%" disabled></el-input>
<el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
<el-input v-model="form.bdcdyh" style="width: 82%" disabled></el-input>
<el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:17%;margin-left:1%">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
<td colspan="4" >
......@@ -64,7 +64,7 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋类型</td>
<td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwlxbsm" placeholder="请选择" >
<el-option
......@@ -75,7 +75,7 @@
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >房屋性质</td>
<td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
......@@ -125,7 +125,7 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >产别</td>
<td colspan="2" align="center" >产别<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" >
<el-option
......@@ -136,7 +136,7 @@
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="2" align="center" >产权来源<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" >
<el-option
......@@ -216,7 +216,7 @@
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
<span>用途</span>
<span>用途<i class="requisite">*</i></span>
</td>
<td width="30" colspan="1" align="center" >
......@@ -257,7 +257,7 @@
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
<span>房屋结构</span>
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="1" align="center" >
<span @click="deleteFwjgInfo(index)">删除</span>
......@@ -303,7 +303,7 @@
<tr height="30">
<td colspan="2" align="center" >
<span>坐落</span>
<span>坐落<i class="requisite">*</i></span>
</td>
<td colspan="10" >
<el-input v-model="form.zl"></el-input>
......
......@@ -12,17 +12,17 @@
<input v-model="form.zddm" class="formInput" disabled>
<input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" >自然幢号</td>
<td colspan="2" >自然幢号<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh" style="width: 70%">
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh">
</td>
</tr>
<tr>
<td colspan="2" >项目名称</td>
<td colspan="2" >项目名称<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc">
</td>
<td colspan="2" >不动产单元号</td>
<td colspan="2" >不动产单元号<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%">
<el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
......@@ -41,7 +41,7 @@
</tr>
<tr>
<td colspan="2" >房屋性质</td>
<td colspan="2" >房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-select class="formSelect" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
......@@ -119,7 +119,7 @@
</tr>
<tr>
<td colspan="2" >产别</td>
<td colspan="2" >产别<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" >
<el-option
......@@ -130,7 +130,7 @@
</el-option>
</el-select>
</td>
<td colspan="2" >产权来源</td>
<td colspan="2" >产权来源<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" >
<el-option
......@@ -146,7 +146,7 @@
<tr v-for="(item1,index) in form.fwytList" :key="index">
<td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle">
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
<span>用途</span>
<span>用途<i class="requisite">*</i></span>
</td>
<td colspan="1" style="min-width:120px">
......@@ -154,7 +154,7 @@
规划用途
</td>
<td colspan="3" >
<el-select-tree
<el-select-tree style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -169,7 +169,7 @@
</td>
<td colspan="2" >用途</td>
<td colspan="4" >
<el-select-tree
<el-select-tree style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -187,7 +187,7 @@
<tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" >
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
<span>房屋结构</span>
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="1" >
<span @click="deleteFwjgInfo(index)">删除</span>
......@@ -215,7 +215,7 @@
<tr>
<td colspan="2" >
<span>坐落</span>
<span>坐落<i class="requisite">*</i></span>
</td>
<td colspan="10" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.zl">
......