Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
69a59e53 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 8a253254 03f86373
Inline Side-by-side
Showing 5 changed files with 148 additions and 80 deletions
......@@ -29,7 +29,7 @@ export function getBdcdyh (dpdm,dptype) {
*/
export function saveDzInfo (data) {
return request({
url: '/fw/qjZrz/updateQjZrz',
url: '/fw/qjDz/updateQjDz',
method: 'put',
data:data
})
......@@ -38,9 +38,9 @@ export function saveDzInfo (data) {
/**
* 保存自然幢信息
*/
export function getZrzDetailByBsm (data) {
export function getDzDetailByBsm (data) {
return request({
url: '/fw/qjZrz/getQjZrzDetailById',
url: '/fw/qjDz/getDzDetailByBsm',
method: 'get',
params:{
id:data
......
......@@ -100,11 +100,12 @@ export default {
this.$emit("changeTop", e.pageY);
this.$emit("changeLeft", e.pageX);
this.$emit("changeZdData",item);
//判断所有权类型
console.log(item.dm,'item.dm ');
if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){
this.$emit("changeCreateVisible", true);
}
this.$emit("changeVisible", false);
// //判断所有权类型
// console.log(item.dm,'item.dm ');
// if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){
// this.$emit("changeCreateVisible", true);
// }
//判断楼盘类型
switch (item.type) {
case 'zd':
......
......@@ -135,17 +135,17 @@ export default {
}
},
createVisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
} else {
document.body.removeEventListener("click", this.closeMenu);
}
}
// createVisible(value) {
// if (value) {
// document.body.addEventListener("click", this.closeMenu);
// } else {
// document.body.removeEventListener("click", this.closeMenu);
// }
// }
},
created() {
console.log("lineTree create");
// this.preDealData(this.pd);
this.preDealData(this.pd);
// this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
},
......@@ -184,8 +184,14 @@ export default {
this.dialogVisible = false;
},
preDealData(list) {
//楼盘表目录树没有expand属性
list[0].expand = list[0].expand == undefined ? true:list[0].expand;
// //楼盘表目录树没有expand属性
// list[0].expand = list[0].expand == undefined ? true:list[0].expand;
list.forEach((x) => {
if (x.expand == undefined) this.$set(x, "expand", true);
if (x.children && x.children.length > 0) {
this.preDealData(x.children);
}
});
return list;
},
// 根据id展开树的具体项
......@@ -206,17 +212,10 @@ export default {
console.log(this.formatData, "this.formatData");
},
itemClick(item) {
item.expand = item.expand == undefined? true:!item.expand;
// item.expand = item.expand == undefined? true:!item.expand;
item.expand = !item.expand;
this.$emit("itemClick", item);
},
// 详情点击
detailClick(data) {
clearTimeout(this.timer);
this.timer = setTimeout(() => {
this.selectedDetail = data;
this.$emit("detailClick", data);
}, 300);
},
//自然幢右键点击事件
openMenu(e,item){
console.log(item,'右键item');
......@@ -228,7 +227,7 @@ export default {
//关闭右键菜单
closeMenu(){
this.lpbvisible = false;
this.createVisible = false;
// this.createVisible = false;
},
//楼盘表右键菜单项打开父组件弹框
openLpbDialog(type){
......
......@@ -116,6 +116,10 @@
this.$store.state.zdbsm = row.glbsm;
path = "/zd";
break;
case "dz":
this.$store.state.dzbsm = row.glbsm;
path = "/dz";
break;
default:
break;
}
......
......@@ -10,12 +10,12 @@
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="4" >
<el-input v-model="form.zdbsm"></el-input>
<el-input v-model="form.zddm"></el-input>
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="4" >
<el-input v-model="form.dyhbsm" style="width: 70%"></el-input>
<el-button @click.prevent="" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
<el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
</td>
</tr>
<tr height="30">
......@@ -27,10 +27,10 @@
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
......@@ -39,12 +39,12 @@
<tr height="30">
<td colspan="2" align="center" >房屋类型</td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" >
<el-select v-model="form.fwlxbsm" placeholder="请选择" >
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in $store.state.fwlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
......@@ -63,10 +63,10 @@
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" >
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in $store.state.cbOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
......@@ -74,16 +74,16 @@
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" >
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
</tr>
<tr height="30" v-for="(item1,index) in form.ytList" :key="index">
<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>
......@@ -94,25 +94,33 @@
规划用途
</td>
<td colspan="4" align="center" >
<el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select-tree class="formInput"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td colspan="1" align="center" >用途</td>
<td colspan="4" align="center" >
<el-select v-model="item1.fwsjytbsm" placeholder="请选择" >
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select-tree class="formInput"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwsjytbsm"
></el-select-tree>
</td>
</tr>
......@@ -201,8 +209,9 @@
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
import {saveDzInfo,getBdcdyh} from "../../../api/dz";
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
import {getQjZdjbxxDetailById} from "../../../api/zd"
export default {
name:'zrz',
components:{
......@@ -211,11 +220,28 @@
},
data () {
return {
//树型结构
show:true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
disabled: false,
checkStrictly: true,
treeProps: {
value: 'bsm',
children: 'children',
label: 'mc'
},
bsm:'', //此页面的多幢标识码
form:{
dzbsm:'', //多幢标识码
zdbsm:'', //宗地标识码
zddm:'', //宗地代码
dyhbsm:'', //不动产单元号标识码
bdcdyh:'', //不动产单元号标识码
zl:'', //坐落
xmmc:'', //项目名称
jgrq:'', //竣工日期
......@@ -228,7 +254,7 @@
zdmj:'', //占地面积
name:'',
date:'',
ytList:[{
fwytList:[{
glbsm:'', //关联标识码
fwytzdbsm:'', //房屋用途字典标识码
sx:'', //顺序
......@@ -262,30 +288,27 @@
}],
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
qlxzGroupTitleRowspan:1, //房屋结构的单元格垂直合并数量
qlxzItemTitleRowspan:1, //房屋结构的单元格垂直合并数量
}
},
methods: {
addYtInfo(){
this.form.ytList.push({
this.form.fwytList.push({
glbsm:'',
fwytzdbsm:'',
fwsjytbsm:'',
sx:'',
});
this.ytTitleRowspan=this.form.ytList.length;
this.ytTitleRowspan=this.form.fwytList.length;
},
deleteYtInfo(index){
if(this.form.ytList.length<=1){
if(this.form.fwytList.length<=1){
this.$message({
message: '不能删除，最少含有一条用途信息',
type: 'warning'
});
}else{
this.form.ytList.splice(index,1);
this.ytTitleRowspan=this.form.ytList.length;
this.form.fwytList.splice(index,1);
this.ytTitleRowspan=this.form.fwytList.length;
}
},
addFwjgInfo(){
......@@ -334,6 +357,47 @@
deleteQlxzItem(index){
},
getDzDetailByBsm(data){
getDzDetailByBsm(data).then((res)=>{
if(res.code===200) {
this.form = res.result;
console.log(this.form+"fwytList")
console.log(this.form)
if(this.form.fwytList.length===0){
this.form.fwytList.push({
glbsm:'', //关联标识码
fwytzdbsm:'', //房屋用途字典标识码
sx:'', //顺序
fwsjytbsm:'', //房屋实际用途字典标识码
})
}
this.ytTitleRowspan=this.form.fwytList.length;
if(res.result.qjQlxzListVOS.length>0){
if(res.result.qjQlxzListVOS[0].list.length<1){
res.result.qjQlxzListVOS[0].list.push({
"pzdjbsm": "",
"pzdjmc": "",
"pzytdm": "",
"pzytmc": "",
"pzytmj": 0,
"qlxzbsm": "",
"sjdjbsm": "",
"sjdjmc": "",
"sjytdm": "",
"sjytmc": "",
"sjytmj": 0,
"syqx": "",
"tdsyjssj": "",
"tdsyqssj": "",
"tdzh": ""
})
}
//权利性质数据传给子组件
this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS
}
}
})
},
onSave(){
......@@ -366,16 +430,13 @@
generatorCode(){
getBdcdyh(this.form.zddm,"dz")
.then((res)=>{
// this.form.zrzh=res.result.substring(0,24);
// this.form.bdcdyh=res.result;
this.form.bdcdyh=res.result;
})
},
},
created() {
if(this.source===1){
this.bsm=this.$route.query.bsm;
// this.form.zdbsm=this.$store.zdbsm;
// this.form.xmmc=this.$store.xmmc;
this.form.dzbsm=this.$route.query.bsm;
this.getZddm(this.$store.state.zdbsm);
}else {
......@@ -383,6 +444,9 @@
this.form.dzbsm=this.$route.query.bsm;
}
if(this.source!==1){
this.bsm=this.$route.query.bsm;
this.form.dzbsm=this.$route.query.bsm;
this.getDzDetailByBsm(this.$route.query.bsm)
}
}
}
......