Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9482cd1b by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 6b97ec38 1eb03185
Inline Side-by-side
Showing 18 changed files with 190 additions and 228 deletions
......@@ -97,3 +97,13 @@ export function saveDzFg(data) {
data: data,
})
}
/**
* 多幢合并保存
*/
export function saveDzHb(data) {
return request({
url: '/bg/dzSplitMerge/dzHb',
method: 'post',
data: data,
})
}
......
......@@ -55,7 +55,6 @@
custom-class="insetDialog"
append-to-body
width="50%"
center
>
<el-form :model="formData" class="qlrForm">
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
......
......@@ -6,7 +6,7 @@
width="50%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<div class="bottom-radio">
<el-radio-group v-model="moveHdata.sxzylx">
......
......@@ -6,7 +6,7 @@
width="50%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<table border="1">
<tr>
......
......@@ -6,7 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<table border="1">
<tr>
......@@ -126,12 +126,12 @@
</tr>
<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>
<el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button>
<span>用途</span>
</td>
<td width="30" colspan="1" align="center" >
<el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
<el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
规划用途
</td>
<td width="30" colspan="4" align="center" >
......@@ -167,11 +167,12 @@
<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>
<el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
<span>房屋结构</span>
</td>
<td colspan="1" align="center" >
<span @click="deleteFwjgInfo(index)">删除</span>
<!-- <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteFwjgInfo(index)" circle>-</el-button>-->
</td>
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
......@@ -187,7 +188,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
</td>
</tr>
<tr></tr>
......@@ -210,7 +211,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="reset">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......@@ -252,6 +253,7 @@
},
form:{
qszt:'0',
jzmj:'',
tnjzmj:'',
ftjzmj:'',
......@@ -360,8 +362,50 @@
this.isVisible = false
this.result()
},
result: function () {
reset: function () {
this.form={
qszt:'0',
jzmj:'',
tnjzmj:'',
ftjzmj:'',
dxbfjzmj:'',
qtjzmj:'',
ftxs:'',
hxbsm:'',
hxjgbsm:'',
gytdmj: '',
fttdmj: '',
dytdmj: '',
fwlxbsm: '',
fwcbbsm:'',
fwcqlybsm:'',
fwxzbsm:'',
dqtgs:'',
nqtgs:'',
xqtgs:'',
bqtgs:'',
fwjgbsm:'',
fwytList:[{
glbsm:'', //关联标识码
fwytzdbsm:'', //房屋用途字典标识码
sx:'', //顺序
fwsjytbsm:'', //房屋实际用途字典标识码
}],
fwjgList:[{
fwjgzdbsm:'', //房屋结构字典标识码
glbsm:'', //关联标识码
sx:'', //顺序
}],
qlxzList:[{
qlxzdm:'', //权利性质代码
glbsm:'', //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzzdbsm:'', //权利性质字典表标识码
qlxzmc:'', //权利名称名称
zhqlxzlx:'', //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
addQjTdytRequestList:[{
}], //土地用途新增实体列表
}]
}
},
save: function () {
this.form['hbsms'] = this.bsms
......@@ -372,6 +416,8 @@
if(res.code===200){
this.lodding()
this.$message.success("保存成功！")
this.reset();
this.close();
}
})
},
......@@ -396,6 +442,7 @@
background-color: #fff;
font-size: 14px;
width: 100%;
table-layout: fixed;
}
td {
......
......@@ -6,7 +6,7 @@
width="50%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<span class="xl" @click="xl">祥例</span>
<table border="1">
......
......@@ -6,7 +6,7 @@
width="60%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<table border="1">
<tr>
......
......@@ -6,7 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
center>
>
<div class="search">
<!-- <el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button> -->
......
......@@ -6,7 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
center>
>
<div class="search">
<el-row>
<el-col :span="24">
......
......@@ -163,67 +163,12 @@
<span class="tips">合并后多幢信息</span>
<table border="1">
<tr>
<th class="xzq">行政区</th>
<th class="djq">地籍区</th>
<th class="djzq">地籍子区</th>
<th class="syqlx">所有权类型</th>
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
</tr>
<tr>
<td class="xzq">
<el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)">
<el-option
v-for="i in xzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<td class="djq">
<el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)">
<el-option
v-for="i in djq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<td class="syqlx">
<el-select v-model="dzhbhData.djzqbsm">
<el-option
v-for="i in djzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<td class="tdtzm">
<el-select v-model="dzhbhData.syqlxbsm">
<el-option
v-for="i in syq"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td class="syqlx">
<el-select v-model="dzhbhData.zdtzmbsm">
<el-option
v-for="i in tdtzm"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<tr v-for="item in dzhbhData" :key="item.bsm">
<td class="xmmc">
<input type="text" v-model="dzhbhData.xmmc" class="formInput"/>
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<span class="xz">选择</span>
......@@ -234,123 +179,13 @@
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" :isZdClose="true"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
<el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="户合并" name="h">
<div class="hb-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="hbq">
<span class="tips">合并前户信息</span>
<table border="1">
<tr>
<td class="xh">序号</td>
<td class="zddm">宗地代码</td>
<td class="bdcdyh">不动产单元号</td>
<td class="xmmc">项目名称</td>
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="">操作</td>
</tr>
<tr v-if="hhbqData.length==0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in hhbqData" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
readonly="readonly"/></td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
readonly="readonly"/></td>
<td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
readonly="readonly"/></td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
readonly="readonly"/></td>
<td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz" @click="deleteData(index)"><span>删除</span></td>
</tr>
</table>
</div>
<div class="hbh">
<span class="tips">合并后户信息</span>
<table border="1">
<tr>
<th class="xzq">行政区</th>
<th class="djq">地籍区</th>
<th class="djzq">地籍子区</th>
<th class="syqlx">所有权类型</th>
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
</tr>
<tr>
<td class="xzq">
<el-select v-model="hhbhData.xzqbsm" @change="changeXzq(hhbhData.xzqbsm)">
<el-option
v-for="i in xzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<td class="djq">
<el-select v-model="hhbhData.djqbsm" @change="changeDjq(hhbhData.djqbsm)">
<el-option
v-for="i in djq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hhbhData.djzqbsm">
<el-option
v-for="i in djzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<td class="tdtzm">
<el-select v-model="hhbhData.syqlxbsm">
<el-option
v-for="i in syq"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hhbhData.zdtzmbsm">
<el-option
v-for="i in tdtzm"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
</el-select>
</td>
<td class="xmmc">
<input type="text" v-model="hhbhData.xmmc" class="formInput"/>
</td>
<td class="zxx">
<span class="xz">选择</span>
</td>
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" :isZdClose="true"
@close="close"></query-data>
<hfghb></hfghb>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
</div>
......@@ -368,12 +203,14 @@
getDdicByMC
} from "./../../../../api/common";
import {ZdHb} from "./../../../../api/zd"
import {saveDzHb} from "./../../../../api/dz"
import QueryData from './../../../../components/queryData/queryData'
import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
import hfghb from '../hfghb/index'
export default {
name: "",
components: {QueryData,zdQueryData},
components: {QueryData,zdQueryData,hfghb},
props: {},
data() {
return {
......@@ -383,7 +220,11 @@
dzhbqData: [], // 多幢合并前数据
hhbqData: [], // 户合并前数据
zdhbhData: {}, // 宗地合并后数据
dzhbhData: {}, // 多幢合并后数据
dzhbhData: [
{
xmmc:''
}
], // 多幢合并后数据
hhbhData: {}, // 户合并后数据
fgBoxWidth: 0,
xzq: [],
......@@ -594,6 +435,31 @@
break;
}
},
//多幢合并保存
dzhbSave(){
console.log(this.dzhbqData,'dzhbqData');
let params = {
fwlist:[],
newdzxmmc:this.dzhbhData[0].xmmc,
zdbsm:''
}
this.dzhbqData.forEach(item=>{
params.fwlist.push({
zbsm:item.bsm,
ztype:item.dylx
})
})
this.$nextTick(()=>{
console.log(params);
//TODO 调用保存接口
// saveDzHb(params).then((res) => {
// })
// .catch((error) => {
// });
})
}
},
computed: {},
watch: {},
......@@ -653,7 +519,7 @@
.addBtn {
position: absolute;
right: 30px;
top: -46px;
top: 0;
z-index: 999;
}
.header {
......
......@@ -55,7 +55,7 @@
title="批量修改"
:visible.sync="centerDialogVisible"
width="30%"
center>
>
<div class="plxg">
<div>
<span class="batchlx"> 界标类型:</span>
......
......@@ -67,7 +67,7 @@
title="批量修改"
:visible.sync="centerDialogVisible"
width="30%"
center>
>
<div class="plxg">
<div class="batchlx">
<span class=""> 界址线类型:</span>
......
......@@ -154,15 +154,27 @@
<tr>
<td colspan="2">国民经济行业分类</td>
<td colspan="4">
<el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm">
<el-option
v-for="item in $store.state.gmjjhyflbsmList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
>
</el-option>
</el-select>
<!-- <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm">-->
<!-- <el-option-->
<!-- v-for="item in $store.state.gmjjhyflbsmList"-->
<!-- :key="item.bsm"-->
<!-- :label="item.mc"-->
<!-- :value="item.bsm"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.gmjjhyflbsmList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="formData.gmjjhyflbsm"
></el-select-tree>
</td>
<td colspan="2">价格(元)</td>
<td colspan="4" class="psr">
......@@ -397,6 +409,21 @@
props: {},
data() {
return {
//树型结构
show: true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: "请选择",
disabled: false,
checkStrictly: true,
treeProps: {
value: "dm",
children: "children",
label: "mc",
},
rules: [],
rjl: '',
jzmd: '',
......
......@@ -310,7 +310,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
</td>
</tr>
<tr></tr>
......
......@@ -220,7 +220,7 @@
</div>
<!-- 右键菜单弹出框 -->
<el-dialog title="添加" :visible.sync="dialogVisible" width="50%" center>
<el-dialog title="添加" :visible.sync="dialogVisible" width="50%" >
<!-- 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容 -->
<div class="addCh" v-show="menuType == 'ljz'">
<addLjz ref="ljz"></addLjz>
......@@ -255,7 +255,7 @@
@close="hcxlzClose"
></h-cxlz>
<!-- 双击户的弹出框 -->
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" >
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
</el-dialog>
</div>
......@@ -507,6 +507,9 @@ export default {
openLpbDialog(data, type) {
this.treeData = data;
this.menuType = type;
this.$nextTick(()=>{
this.resetInfo();
});
this.dialogVisible = true;
},
//弹框中的保存按钮，根据不同菜单点击类型调用不同子组件的保存方法
......
......@@ -29,16 +29,9 @@
<td colspan="4">
<el-input v-model="form.ljzmc"></el-input>
</td>
<td colspan="2" align="center">不动产单元号</td>
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" maxlength="28" class="percent80"></el-input>
<el-button
@click.prevent=""
size="mini"
type="warning"
class="createBtn"
>生成</el-button
>
<td colspan="2" align="center">建筑物状态</td>
<td colspan="4">
<el-input v-model="form.jzwzt"></el-input>
</td>
</tr>
......@@ -177,13 +170,9 @@
<tr height="30">
<td colspan="2" align="center">总层数</td>
<td colspan="4">
<td colspan="10">
<el-input v-model="form.zcs"></el-input>
</td>
<td colspan="2" align="center">建筑物状态</td>
<td colspan="4">
<el-input v-model="form.jzwzt"></el-input>
</td>
</tr>
<tr height="30">
......
......@@ -263,7 +263,6 @@
:title="addCData.title"
:visible.sync="addCVisible"
width="50%"
center
>
<el-form :model="addCData">
<el-form-item label="层号" :label-width="formLabelWidth">
......
<template>
<div class="">
<el-radio-group v-model="scyclx" @change="scyclxChange">
<el-radio-button label="0">预测</el-radio-button>
<el-radio-button label="1">实测</el-radio-button>
</el-radio-group>
<el-table
:data="tableData"
style="width: 100%;margin-bottom: 20px;"
row-key="bsm"
border
default-expand-all
:default-expand-all="false"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="mc"
......@@ -35,23 +39,23 @@
</el-table-column>
<el-table-column
prop="jzmj"
label="面积">
label="建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="tnjzmj"
label="套内建筑面积">
label="套内建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="ftjzmj"
label="分摊建筑面积">
label="分摊建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="dxbfjzmj"
label="地下部分建筑面积">
label="地下部分建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="qtjzmj"
label="其它建筑面积">
label="其它建筑面积(㎡)">
</el-table-column>
</el-table>
</div>
......@@ -65,7 +69,10 @@ export default {
props:{},
data(){
return {
tableData: []
tableData: [],
scData:[],
ycData:[],
scyclx:'0',
}
},
created(){},
......@@ -74,6 +81,14 @@ export default {
},
methods:{
scyclxChange(){
if(this.scyclx === '0'){
this.tableData = this.ycData;
}else {
this.tableData = this.scData;
}
},
chFilter(row, column){
if(row.ch === 0){
return ''
......@@ -91,12 +106,19 @@ export default {
},
getData(){
let zrzbsm = '12a4eb0cf2b527273ff5f0b96820715a';
let scyclx = '0';
getDetailInfo(zrzbsm,scyclx).then((res)=>{
let zrzbsm = this.$store.state.zrzbsm;
// let scyclx = this.scyclx;
getDetailInfo(zrzbsm,'0').then((res)=>{
if(res.code===200){
console.log(res.result)
this.ycData = res.result;
this.tableData=this.ycData;
}
});
getDetailInfo(zrzbsm,'1').then((res)=>{
if(res.code===200){
console.log(res.result)
this.tableData = res.result;
this.scData = res.result;
}
})
},
......