Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
10900e63 by 焦泽平
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 7d457289 90ccb6e9
Expand all
Inline Side-by-side
Showing 8 changed files with 80 additions and 23 deletions
......@@ -37,7 +37,7 @@
table{
border-width: 0;
}
table,td,tr,.el-col,.title{
table,tr,.el-col,.title{
border-color: #E6E6E6 !important;
}
.el-table th{
......
......@@ -537,7 +537,6 @@
if(this.$store.state.gyfsList.length>0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}
},
};
</script>
......
......@@ -760,20 +760,15 @@
zbsm: bsm,
ztype: 'dz'
})
console.log(this.zdFghData, 'zdFghData')
},
xzZrz(bsm, index) {
this.zdFghData.newZdlist.fwlist[index].push({
zbsm: bsm,
ztype: 'zrz'
})
console.log(this.zdFghData, 'zdFghData')
},
dzHandleCommand(command, index) {
console.log(command,"============")
let item = this.zdDzList.filter(i => i.bsm == command)[0];
console.log(item,"item........")
console.log(this.zdDzList,"zdDzlist")
this.zdFghData.newZdlist[index].fwlist.push({
zbsm: command,
ztype: 'dz'
......@@ -846,11 +841,17 @@
},
saveZd() {
zdfg(this.zdFghData).then(res => {
console.log(res)
if (res.success) {
Message.success('保存成功')
this.$router.push({
path: '/zd',
query: {
bsm: res.result[0],
source: 2
}
});
} else {
Message.error(res.message)
Message.error("保存失败")
}
})
},
......
......@@ -15,7 +15,7 @@
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="cz">操作</td>
<td>操作</td>
</tr>
<tr v-if="zdhbqData.length==0">
<td colspan="7">
......@@ -112,7 +112,7 @@
</tr>
</table>
</div>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
......@@ -572,7 +572,6 @@
}
</script>
<style scoped lang="less">
.hb {
.menu {
/deep/ .el-tabs__content {
......@@ -722,4 +721,11 @@
margin-top: 10px;
}
}
.cz{
color: blue;
}
.cz:hover{
color: blue;
text-decoration: underline;
}
</style>
......
......@@ -265,7 +265,12 @@ export default {
this.$store.state.zdbsm = res.result;
//todo 跳转到宗地基本信息内容表页面 (预留)
this.close();
this.$router.push("/zd");
this.$router.push({
path: '/zd', query:{
source: 2,
bsm:res.result
}
});
} else {
this.$message.error(res.message);
}
......
<template>
<div class="main">
<div class="formMenu">
<Qlr ref="qlrxxModule" :bsm="$store.state.zdbsm" :qszt="formData.qszt"></Qlr>
<Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
<!-- <el-button
type="primary"
class="changeBtn"
......@@ -407,12 +407,12 @@ export default {
{ label: "-", value: "-" },
],
formData: {},
dpdm:'', //宗地底盘代码
curZdbsm:'',
};
},
created() {
this.curZdbsm = this.$route.query.bsm;
},
mounted() {
this.getZdjbxxData(this.$store.state.zdbsm);
......@@ -453,8 +453,44 @@ export default {
"tdzh": ""
})
}
this.$nextTick(()=>{
//权利性质数据传给子组件
this.$refs.qlxzModule.countList = res.result.list;
})
}else{
this.$nextTick(()=>{
//权利性质数据传给子组件
this.$refs.qlxzModule.countList = [
{
id: Math.random(),
isInside: false,
hasNotBorder: false,
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
list: [
{
pzdjbsm: "",
pzdjmc: "",
pzytdm: "",
pzytmc: "",
pzytmj: 0,
qlxzbsm: "",
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
sjytmc: "",
sjytmj: 0,
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
tdzh: "",
},
],
},
];
})
}
}
})
......@@ -678,6 +714,7 @@ export default {
},
zdbsm:function (val) {
this.getZdjbxxData(val)
this.curZdbsm = this.$route.query.bsm;
}
},
};
......
......@@ -138,7 +138,7 @@
v-for="(item, index) in dyztList"
:key="index"
class="cp"
@click="handleChoosedH(item.bsms)"
@click="handleChoosedH(item.bsms,item.color)"
>
<td>
<i class="fa fa-circle" :style="{ color: item.color }"></i
......@@ -165,7 +165,7 @@
v-for="(item, index) in fwxzList"
:key="index"
class="cp"
@click="handleChoosedH(item.bsms)"
@click="handleChoosedH(item.bsms,item.color)"
>
<td>
<i class="fa fa-circle" :style="{ color: item.color }"></i
......@@ -195,7 +195,7 @@
v-for="(item, index) in fwytList"
:key="index"
class="cp"
@click="handleChoosedH(item.bsms)"
@click="handleChoosedH(item.bsms,item.color)"
>
<td>
<i class="fa fa-circle" :style="{ color: item.color }"></i
......@@ -596,14 +596,23 @@ export default {
}
});
},
//选中房屋状态
handleChoosedH(bsms) {
console.log(bsms,'bsms');
//切换房屋状态
handleChoosedH(bsms,color) {
//每次切换房屋状态，将之前高亮的户边框颜色重置为默认
this.$refs.lpbContent.choosedList = [];
this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
item.style.borderColor = '#E6E6E6';
});
// console.log(bsms,'bsms');
// console.log(color,'color');
// Dyzt:{list:[],mj:''}
//清除选中户
this.$refs.lpbContent.clearChoosedH();
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
//给hBsmList传值
this.$refs.lpbContent.choosedList = bsms;
this.$refs.lpbContent.borderColor = color;
})
},
//批量添加不动产单元号
addBdcdyh() {
......