Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
ddf3d039 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents 4c0e9097 18776a57
Expand all
Inline Side-by-side
Showing 26 changed files with 349 additions and 144 deletions
......@@ -20,4 +20,7 @@ yarn-error.log*
*.sln
*.sw?
package-lock.json
CadastralSystem.iml
CadastralSyst
em.iml
*.env
*.gitignore
......
......@@ -70,3 +70,13 @@ export function hhb(data) {
data: data
})
}
/**
* 户分割
*/
export function hfg(data) {
return request({
url: '/bg/hSplitMerge/hFg',
method: 'post',
data: data
})
}
\ No newline at end of file
......
......@@ -116,7 +116,7 @@ ol, ul { list-style:none; }
>.el-tabs__item{
border: 1px solid #DEDEDE;
height: 30px;
line-height: 30px;
line-height: 28px;
padding: 0 20px;
margin: 9px 10px 9px 0;
}
......@@ -128,6 +128,9 @@ ol, ul { list-style:none; }
}
}
}
.el-tabs__item{
font-size: 16px;
}
//弹框遮罩层样式
.v-modal{
opacity: .2;
......@@ -262,3 +265,11 @@ ol, ul { list-style:none; }
.iconfontEdit:hover{
color: rgb(0, 108, 255);
}
.el-select,.el-select-tree,.el-date-editor{
/deep/ .el-input__inner{
text-align: left!important;
}
}
.el-input__prefix, .el-input__suffix{
top: -2px;
}
\ No newline at end of file
......
......@@ -720,6 +720,8 @@ export default {
// height: 100%;
border-right: 1px solid #E6E6E6;
position: relative;
text-align: right;
padding-right: 10px;
.qlxz {
line-height: 34px;
}
......
......@@ -373,6 +373,8 @@ export default {
// height: 100%;
border-right: 1px solid #E6E6E6;
position: relative;
text-align: right;
padding-right: 10px;
.qlxz {
line-height: 34px;
}
......
......@@ -15,7 +15,7 @@
<div
class="row-flex-start basic_banner"
@click="itemClick(item)"
@dblclick="dbclick(item)"
@dblclick="dbclick(item,item.zdbsm)"
:class="{
active_color: item.expand,
}"
......@@ -24,8 +24,8 @@
v-if="item.children"
class="reTree_icon"
:style="{
height: (size || 14 * 1.2) + 'px',
width: (size || 14 * 1.2) + 'px',
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
......@@ -37,8 +37,8 @@
v-if="item.children==null"
class="reTree_icon reTree_expand_icon"
:style="{
height: (size || 14 * 1.2) + 'px',
width: (size || 14 * 1.2) + 'px',
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
></div>
<div
......@@ -46,8 +46,10 @@
@contextmenu.prevent="openMenu($event, item,list)"
:class="{
active_color: item.expand,
curPage:$route.query.bsm==item.bsm
curPage:$route.query.bsm && $route.query.bsm==item.bsm
}"
:ref="($route.query.bsm && $route.query.bsm==item.bsm)?'curZxx':''"
:data-zdbsm="item.zdbsm"
>
<img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
<img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/>
......@@ -83,7 +85,7 @@ export default {
},
size: {
type: Number,
default: 14,
default: 16,
},
visible: {
type: Boolean,
......@@ -104,7 +106,11 @@ export default {
}
},
mounted(){
// console.log(this.$refs.curZxx,'this.$refs.curZxx');
if(this.$refs.curZxx){
console.log(this.$refs.curZxx[0].dataset.zdbsm);
this.$store.state.oldZdbsm = this.$refs.curZxx[0].dataset.zdbsm;
}
},
methods: {
itemClick(item) {
......@@ -174,8 +180,9 @@ export default {
}
},
// 左键双击事件
dbclick(item) {
dbclick(item,bsm) {
clearTimeout(this.time);
this.$store.state.newZdbsm = bsm;
//此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
if (item.type == 'zd') {
this.$store.state.zdbsm = item.bsm;
......@@ -342,8 +349,8 @@ export default {
content: "";
position: absolute;
/* 为了触顶 */
top: -14px;
height: calc(100% + 14px);
top: -16px;
height: calc(100% + 16px);
width: 1px;
left: 7px;
opacity: .5;
......@@ -355,7 +362,7 @@ export default {
content: "";
position: absolute;
height: 23px;
top: -14px;
top: -16px;
width: 1px;
left: 7px;
opacity: .5;
......@@ -401,7 +408,7 @@ export default {
background-size: contain;
}
.qsztImg{
width: 14px;
width: 16px;
position: relative;
top: 1px;
}
......
<template>
<div
class="content column-start-center reTree_box"
:style="{ fontSize: (size || 14) + 'px', lineHeight: (size || 14) + 'px', width: (islpb ? '200':'374') + 'px' }"
:style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }"
>
<div
class="column-start-center basic_layer"
......@@ -19,8 +19,8 @@
<div
class="reTree_icon"
:style="{
height: (size || 14 * 1.2) + 'px',
width: (size || 14 * 1.2) + 'px',
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
......@@ -129,7 +129,7 @@ export default {
pd: {},
size: {
type: Number,
default: 14,
default: 16,
},
islpb:{
type: Boolean,
......@@ -143,7 +143,7 @@ export default {
sxdrVisible:false,
selectedDetail: {},
timer: {},
formatData: [],
formatData: this.$store.state.treeData,
visible: false,
top: 0,
left: 0,
......@@ -168,9 +168,7 @@ export default {
watch: {
pd(n, o) {
this.formatData = this.preDealData(n);
console.log(this.formatData);
},
lpbvisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
......@@ -195,7 +193,6 @@ export default {
// }
},
created() {
console.log("lineTree create");
this.preDealData(this.pd);
// this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
},
......@@ -303,8 +300,6 @@ export default {
},
itemClick(item) {
// item.expand = item.expand == undefined? true:!item.expand;
console.log(item,'item');
console.log(this.formatData,'this.formatData');
this.formatData.forEach(i=>{
if(i.bsm != item.bsm){
i.expand = false
......@@ -338,11 +333,9 @@ export default {
})
}
})
console.log(this.formatData,'formatData');
},
//自然幢右键点击事件
openMenu(e,item){
console.log(item,'右键item');
this.lpbleft = e.pageX;
this.lpbtop = e.pageY;
this.zdData = item;
......@@ -731,8 +724,8 @@ export default {
content: "";
position: absolute;
/* 为了触顶 */
top: -14px;
height: calc(100% + 14px);
top: -16px;
height: calc(100% + 16px);
width: 1px;
left: 9px;
background: #c3c5c8;
......@@ -742,7 +735,7 @@ export default {
content: "";
position: absolute;
height: 23px;
top: -14px;
top: -16px;
width: 1px;
left: 9px;
background: #c3c5c8;
......
......@@ -292,7 +292,7 @@ export default {
}
},
cadFileSuccess(response, file, fileList){
debugger
},
excelFileSuccess(response, file, fileList){
var self = this;
......
......@@ -12,31 +12,31 @@
<tr>
<td>层建筑面积(㎡)</td>
<td>
<el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input>
<el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
层套内建筑面积(㎡)
</td>
<td>
<el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input>
<el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
</tr>
<tr>
<td>层阳台面积(㎡)</td>
<td>
<el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input>
<el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
层半墙面积(㎡)
</td>
<td>
<el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input>
<el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
</tr>
<tr>
<td>层共有建筑面积(㎡)</td>
<td>
<el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input>
<el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
层分摊建筑面积(㎡)
......
......@@ -128,12 +128,29 @@
key: '2',
label: '实际层',
value: '2'
}, {
key: '3',
label: '空',
value: '3'
}
]
}
},
methods: {
lodding:function(){
test: function () {
for (let key in this.plshData) {
console.log(key)
console.log(this.plshData[key])
if (key === 'chqbl') {
continue;
}
if (this.plshData[key] !== '' && this.plshData[key] !== '3' && this.plshData[key] !== false) {
return true;
}
}
return false;
},
lodding: function () {
this.$emit('lodding')
},
xl: function () {
......@@ -156,6 +173,10 @@
}
},
save: function () {
if (!this.test()) {
this.$message.info("请选择")
return;
}
this.plshData['bsms'] = this.bsms
updateSh(this.plshData).then(res => {
if (res.success) {
......@@ -174,25 +195,25 @@
computed: {
gz: function () {
let gz = "";
if (this.plshData.shqz != "") {
if (this.plshData.shqz !== "") {
gz += this.plshData.shqz
}
if (this.plshData.selectDyh) {
gz += "[单元号]"
}
if (this.plshData.fgfA != "") {
if (this.plshData.fgfA !== "") {
gz += this.plshData.fgfA
}
if (this.plshData.c == 1) {
if (this.plshData.c === 1) {
gz += "[名义层]"
} else if (this.plshData.c == 2) {
} else if (this.plshData.c === 2) {
gz += "[实际层]"
}
if (this.plshData.fgfB != "") {
if (this.plshData.fgfB !== "") {
gz += this.plshData.fgfB
}
gz += "[户号]";
if (this.plshData.shhz != "") {
if (this.plshData.shhz !== "") {
gz += this.plshData.shhz
}
return gz;
......
......@@ -121,12 +121,12 @@
isVisible: false,
plzlData: {
qz: '',
zd: '',
zrz: '',
ljz: '',
zdy: '',
c: '',
h: '',
zd: '3',
zrz: '3',
ljz: '3',
zdy: '3',
c: '3',
h: '3',
hz: ''
},
zdgz: [
......@@ -160,6 +160,9 @@
}, {
label: "逻辑幢号",
value: '2'
}, {
label: "空",
value: '3'
}
],
zdygz: [
......@@ -169,6 +172,9 @@
}, {
label: "幢单元号",
value: '2'
}, {
label: "空",
value: '3'
}
],
cgz: [
......@@ -180,6 +186,9 @@
key: '2',
label: '实际层',
value: '2'
}, {
label: "空",
value: '3'
}
],
hgz: [
......@@ -191,15 +200,22 @@
key: '2',
label: '户号',
value: '2'
}, {
label: "空",
value: '3'
}
]
}
},
methods: {
lodding:function(){
lodding: function () {
this.$emit('lodding')
},
save: function () {
if (!this.test()) {
this.$message.info("请选择")
return;
}
this.plzlData['bsms'] = this.bsms;
updateZl(this.plzlData).then(res => {
if (res.success) {
......@@ -210,8 +226,15 @@
}
})
},
test: function () {
for (let key in this.plzlData) {
if (this.plzlData[key] !== '' && this.plzlData[key] !== '3') {
return true;
}
}
return false;
},
cancel: function () {
console.log("cancel......")
this.close();
},
close: function () {
......@@ -220,7 +243,6 @@
this.result();
},
result: function () {
console.log("重置")
this.plzlData = {
qz: '',
zd: '',
......@@ -237,45 +259,45 @@
gz: function () {
// [前缀][宗地][自然幢][单元][室号][室号][后缀]
let gz = "";
if (this.plzlData.qz != '') {
if (this.plzlData.qz !== '') {
gz += this.plzlData.qz
}
if (this.plzlData.zd == 1) {
if (this.plzlData.zd === 1) {
gz += "[宗地坐落]";
} else if (this.plzlData.zd == 2) {
} else if (this.plzlData.zd === 2) {
gz += "[宗地名称]";
}
if (this.plzlData.zrz == 1) {
if (this.plzlData.zrz === 1) {
gz += "[自然幢坐落]"
} else if (this.plzlData.zrz == 2) {
} else if (this.plzlData.zrz === 2) {
gz += "[自然幢名称]";
}
if (this.plzlData.ljz == 1) {
if (this.plzlData.ljz === 1) {
gz += "[逻辑幢名称]"
} else if (this.plzlData.ljz == 2) {
} else if (this.plzlData.ljz === 2) {
gz += "[逻辑幢号]"
}
if (this.plzlData.zdy == 1) {
if (this.plzlData.zdy === 1) {
gz += "[幢单元名称]";
} else if (this.plzlData.zdy == 2) {
} else if (this.plzlData.zdy === 2) {
gz += "[幢单元号]"
}
if (this.plzlData.c == 1) {
if (this.plzlData.c === 1) {
gz += "[名义层]"
} else if (this.plzlData.c == 2) {
} else if (this.plzlData.c === 2) {
gz += "[实际层]"
}
if (this.plzlData.h == 1) {
if (this.plzlData.h === 1) {
gz += "[室号]"
} else if (this.plzlData.h == 2) {
} else if (this.plzlData.h === 2) {
gz += "[户号]"
}
if (this.plzlData.hz != "") {
if (this.plzlData.hz !== "") {
gz += this.plzlData.hz
}
if (gz == "") {
if (gz === "") {
gz += "无"
}
return gz;
......
......@@ -50,7 +50,8 @@
uploadUrl: '',
isVisible: false,
sxdrData: {
bsm: ''
bsm: '',
type:''
},
errorData: []
}
......@@ -72,13 +73,12 @@
this.reset();
},
downloadTemplate() {
window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx);
window.open(`/api/tx/excelGeo/template?type=` + this.dylx);
},
uploadSuccess(res, file, fileList) {
this.errorData = [];
if (res.success) {
this.$message.success("上传成功")
debugger
this.loading();
this.close()
} else {
......@@ -96,9 +96,10 @@
this.isVisible = val;
},
dylx(val) {
this.sxdrData.type=val;
switch (val) {
case "zd":
this.uploadUrl = "/api/tx/excelGeo/Zdimport";
this.uploadUrl = "/api/tx/excelGeo/import";
break;
default:
break;
......
......@@ -50,6 +50,8 @@ const store = new Vuex.Store({
zrzh:'', //自然幢号
dzbsm:'', // 多幢bsm
treeData:[], // 树数据
oldZdbsm:'',
newZdbsm:'',
},
modules: {
user,
......
......@@ -11,7 +11,7 @@
<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
</div>
<div class="treeModule" :style="{height:treeHeight+'px'}">
<LineTree :pd="pd" @itemClick="itemClick"></LineTree>
<LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree>
</div>
</el-aside>
<el-container class="calcWidth">
......@@ -137,11 +137,12 @@ export default {
"/announcement_template": "PSH019",
"/business_management": "PSH020",
},
pd: [],
pd: this.$store.state.treeData,
dialogVisible: false,
isMap:false,
treeHeight:0,
routerInfo:null
routerInfo:null,
lineTreeVisible:false,
};
},
computed: {
......@@ -192,10 +193,15 @@ export default {
"$store.state.treeData":function (val) {
console.log(val,'val');
this.pd = val;
}
},
'$store.state.treeZdbsm':function (val) {
console.log(val,'val');
},
},
mounted(){
this.$nextTick(()=>{
this.lineTreeVisible = true
})
},
created() {
if (this.$route.meta) {
......@@ -248,6 +254,8 @@ export default {
this.getRightTreeByZrzbsm(this.$store.state.zrzbsm)
}else if(this.$route.path == '/zd'){
this.getRightTree(this.$store.state.zdbsm)
}else if(this.$route.path == '/dz'){
this.getRightTreeByDzbsm(this.$store.state.dzbsm)
}else{
this.getTreeList();
}
......@@ -311,24 +319,35 @@ export default {
getTree(bsm).then((res) => {
if (res.success) {
this.pd = res.result;
this.$store.state.newZdbsm = '';
}
});
},
getRightTreeByZrzbsm(bsm) {
if (this.$store.state.newZdbsm != this.$store.state.oldZdbsm) {
getTreeByBsm(bsm,"zrz").then((res) => {
if (res.success) {
this.pd = res.result;
this.$store.state.treeData = res.result;
}
});
}else{
}
},
getRightTreeByDzbsm(bsm) {
if (this.$store.state.newZdbsm != this.$store.state.oldZdbsm) {
getTreeByBsm(bsm,"dz").then((res) => {
if (res.success) {
this.pd = res.result;
this.$store.state.treeData = res.result;
}
});
}else{
}
},
getRightTreeByHbsm(bsm) {
......@@ -400,6 +419,7 @@ export default {
getTreeList(){
getTreeList().then((res)=>{
this.pd=res.result;
this.$store.state.newZdbsm = '';
})
},
goBack(){
......@@ -468,7 +488,7 @@ export default {
cursor: pointer;
height: 60px;
padding: 0 30px;
font-size: 16px;
font-size: 18px;
line-height: 60px;
float: left;
position: relative;
......
......@@ -37,20 +37,14 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋类型</td>
<td colspan="2" align="center" >共有土地面积（㎡）</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<input class="formInput" v-model="form.zdmj">
</td>
<td colspan="2" align="center" >竣工日期</td>
<td colspan="4" >
<el-date-picker
style="width:100%"
v-model="form.jgrq"
type="date"
placeholder="选择日期">
......@@ -59,6 +53,10 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >分摊土地面积（㎡）</td>
<td colspan="4" >
<input class="formInput" v-model="form.fttdsymj">
</td>
<td colspan="2" align="center" >产别</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
......@@ -70,6 +68,13 @@
</el-option>
</el-select>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
<td colspan="4" >
<input class="formInput" v-model="form.dlsytdmj">
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
......@@ -96,6 +101,7 @@
<td colspan="3" align="center" >
<el-select-tree style="width:100%"
v-if="show"
@change="updateSjfyyt(item1)"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
......@@ -124,21 +130,6 @@
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >共有土地面积（㎡）</td>
<td colspan="2" >
<input class="formInput" v-model="form.zdmj">
</td>
<td colspan="2" align="center" >分摊土地面积（㎡）</td>
<td colspan="2" >
<input class="formInput" v-model="form.fttdsymj">
</td>
<td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
<td colspan="2" >
<input class="formInput" v-model="form.dlsytdmj">
</td>
</tr>
<tr>
<td colspan="12" align="center">
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
......@@ -450,6 +441,11 @@
}
})
},
updateSjfyyt(data){
data.fwsjytbsm = data.fwytzdbsm;
},
open() {
this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
confirmButtonText: '确定',
......@@ -497,7 +493,17 @@
this.getDzDetailByBsm(this.$route.query.bsm)
}
},
computed: {
dzbsm() {
return this.$route.query.bsm;
},
},
watch:{
dzbsm:function (val) {
this.getDzDetailByBsm(val)
},
"$store.state.sxdrType": {
handler(n) {
this.$nextTick(()=>{
......
......@@ -184,11 +184,11 @@
</div>
</el-tab-pane>
<el-tab-pane label="户合并" name="h">
<div class="hb-tabs psn">
<div class="hb-tabs psn" v-if="hhbtabs">
<hfghb></hfghb>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<!-- <div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
</div>
</div> -->
</div>
</el-tab-pane>
</el-tabs>
......@@ -201,11 +201,11 @@
getListByXzqbsm,
getListByPbsm,
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'
} 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 {
......@@ -245,6 +245,7 @@
value: "Z",
}
],
hhbtabs:false,
}
},
created() {
......@@ -257,6 +258,11 @@
})
},
methods: {
handleClick(tab, event) {
if (tab.name == 'h') {
this.hhbtabs = true
}
},
save(){
switch (this.tabName) {
case "zd":
......@@ -277,13 +283,14 @@
let data={
newzddjqbsm: this.zdhbhData.djqbsm,
newzddjzqbsm: this.zdhbhData.djzqbsm,
newzdsyqlxbsm: this.zdhbqData.syqlxbsm,
newzdsyqlxbsm: this.zdhbhData.syqlxbsm,
newzduserbsm: "",
newzdxmmc: this.zdhbqData.xmmc,
newzdxzqbsm: this.zdhbqData.xzqbsm,
newzdzdtzmbsm: this.zdhbqData.zdtzmbsm,
newzdxmmc: this.zdhbhData.xmmc,
newzdxzqbsm: this.zdhbhData.xzqbsm,
newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
oldzdbsms: oldBsm
}
console.log(data,'宗地合并数据')
ZdHb(data).then(res=>{
if (res.success) {
this.$message.success("合并成功")
......@@ -392,9 +399,6 @@
});
}
},
handleClick(tab, event) {
console.log(tab, event);
},
close: function () {
this.centerDialogVisible = false;
},
......@@ -493,7 +497,7 @@
> .el-tabs__item {
border: 1px solid #DEDEDE;
height: 36px;
line-height: 36px;
line-height: 32px;
padding: 0 20px;
margin: 9px 10px 9px 0;
background-color: #ffffff;
......
......@@ -84,7 +84,7 @@
<div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true></lpbContent>
<lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true :isHb="isHb"></lpbContent>
</div>
<!-- 右侧图例 -->
<div class="lp-legend">
......@@ -215,7 +215,12 @@ import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFw
export default {
name:"",
components:{lpbContent},
props:{},
props:{
isHb:{
type:Boolean,
default:true
}
},
data(){
return {
queryData:{
......@@ -299,8 +304,8 @@ export default {
created(){},
mounted(){
this.$nextTick(()=>{
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 360;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320;
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270;
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
})
},
......@@ -313,7 +318,7 @@ export default {
xmmc:'测试自然幢',
bdcqzh:'A12111111111111111',
dylx:'zrz',
zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b'
zrzbsm:'1a94f3ab0f95ecc7137c5c3e51c15ac6'
}
]
},
......@@ -495,12 +500,14 @@ export default {
</script>
<style scoped lang="less">
.main{
margin-bottom: 14px;
.el-row{
box-sizing: border-box;
padding-left: 2px;
margin-bottom: 6px;
}
.pagination{
padding-bottom: 0!important;
}
.lpb{
box-sizing: border-box;
padding-left: 2px;
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<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="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb ref="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 v-if="cxlzLoad"></cxlz></el-tab-pane>
</el-tabs>
......@@ -23,6 +23,7 @@ export default {
data() {
return {
activeName: "fg",
fgLoad:true,
hbLoad:false, //默认不加载合并tab
fwsxbgLoad:false, //默认不加载范围属性变更tab
cxlzLoad:false, //默认不加载重新落宗tab
......@@ -30,10 +31,19 @@ export default {
},
methods: {
handleClick(tab, event) {
console.log(tab.name);
// this.$refs.fg.$refs.isSearch = true;
if (tab.name != 'fg') {
this.fgLoad = false;
}
if (tab.name != 'hb') {
this.hbLoad = false;
}
if(!this.hbLoad){
this.hbLoad = tab.name == 'hb' ? true : false
}
if(!this.fgLoad){
this.fgLoad = tab.name == 'fg' ? true : false
}
if(!this.fwsxbgLoad){
this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
}
......
......@@ -21,6 +21,8 @@
{{scope.row.dylx | bdcLxFilter}}
</template>
</el-table-column>
<el-table-column prop="qsztValue" align="left" label="权属状态">
</el-table-column>
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
......
......@@ -189,7 +189,7 @@ export default {
getLshsData(){
let _this = this;
const data = {
"bsm": "d85a274a332ad2d35c922a3a95eb154f",
"bsm": this.$store.state.zdbsm,
"type": "zd"
};
getLshs(data).then((res)=>{
......
......@@ -43,7 +43,9 @@
>
</td>
<td class="dzwdm">
<el-input v-model="item.dzwdm" placeholder="请输入定着物代码">
<el-input v-model="item.dzwdm" placeholder="请输入定着物代码"
maxlength="9"
>
</el-input>
</td>
<td class="syqmj">
......
......@@ -238,6 +238,7 @@
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
@change="updateSjfyyt(item1)"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disableFlag"
......@@ -524,8 +525,10 @@
},
created(){
let bsm=this.$store.state.hbsm
console.log(bsm,'户BSM')
// console.log(bsm,'户BSM')
if (bsm) {
this.getHInfo(bsm);
}
this.$nextTick(()=>{
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320
......@@ -544,6 +547,11 @@
}
})
},
updateSjfyyt(data){
data.fwsjytbsm = data.fwytzdbsm;
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......@@ -585,8 +593,7 @@
},
//根据户bsm查询户信息
getHInfo(hbsm){
this.bsm = hbsm;
console.log(hbsm);
//this.bsm = hbsm;
getQjHDetailByBsm(hbsm).then((res)=>{
if(res.code===200){
this.form = res.result;
......@@ -621,8 +628,6 @@
this.$set(this.form,"ycftxs", this.form.glftxs)
}
console.log("=============")
console.log(this.form)
if(res.result.fwytList.length===0){
this.form.fwytList.push({
glbsm:'', //关联标识码
......
......@@ -13,6 +13,7 @@
? 'bottom40 ljz-wrap'
: 'ljz-wrap'
"
:style="{'width':ljzWidth+'px'}"
v-show="lpbData.ljzs.length > 0"
>
<!-- 循环逻辑幢数据 -->
......@@ -83,6 +84,7 @@
<!-- 循环逻辑幢下的层户 -->
<div
class="ljz-ch"
ref="ljzDlch"
:style="{ height: 'auto' }"
v-if="ljzs.cs.length > 0"
>
......@@ -195,6 +197,7 @@
<!-- <template > -->
<div
class="zdy column-reverse"
ref="zrzDlch"
:style="{ 'min-height': cHeight + 'px' }"
>
<table
......@@ -262,6 +265,9 @@
<!-- 合并 -->
<li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li>
<li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
<!-- 分割 -->
<li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li>
<!-- <li v-show="rightClickFlag == 'fg'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> -->
</ul>
<!-- 层操作弹框 -->
......@@ -293,6 +299,26 @@
<el-button type="primary" @click="saveAddC">保存</el-button>
<el-button type="primary" @click="addCVisible = false">取消</el-button>
</div>
</el-dialog >
<!-- 户分割弹框 -->
<el-dialog
title = "户分割"
:visible.sync="hfgDialogVisible"
width="800px"
>
<el-form :model="fgData">
<el-form-item label="分割户数" required="" :label-width="formLabelWidth">
<el-input
:disabled="fgData.fgfx!=0"
v-model="fgData.fghs"
autocomplete="off"
></el-input>
</el-form-item>
</el-form>
<div class="btnGroup">
<el-button type="primary" @click="savefgData">保存</el-button>
<el-button type="primary" @click="hfgDialogVisible = false">取消</el-button>
</div>
</el-dialog>
<move-h
:hbsm="chData.bsm"
......@@ -304,9 +330,9 @@
</div>
</template>
<script>
import moveH from "./../../../../../components/moveH/moveH";
import moveH from "@components/moveH/moveH";
import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
import { hhb } from "@api/h";
import { hhb,hfg } from "@api/h";
import { Message } from 'element-ui';
export default {
name: "",
......@@ -319,6 +345,10 @@ export default {
zrzbsm:{
type:String,
default:''
},
isHb:{
type:Boolean,
default:true
}
},
data() {
......@@ -363,7 +393,13 @@ export default {
yclpbData:{},
sclpbData:{},
fghbChoosedList:[],
canHb:''//判断合并类型
canHb:'',//判断合并类型
hfgDialogVisible:false, //户分割弹框
fgData:{
fghs:"",
oldbsm:'',
fgfx:0
}
};
},
created() {},
......@@ -433,11 +469,16 @@ export default {
dataChange() {
//计算逻辑幢宽度 20为marginRight值
this.ljzWidth = 20;
if (this.$refs.ljz != undefined) {
this.$refs.ljz.forEach((item) => {
if (this.$refs.ljzzdy != undefined) {
this.$refs.ljzzdy.forEach((item) => {
this.ljzWidth += item.offsetWidth + 20;
});
} else {
if (this.$refs.ljzDlch != undefined) {
this.$refs.ljzDlch.forEach((item) => {
this.ljzWidth += item.offsetWidth + 20;
});
}
}
//计算独立幢单元和独立层户宽度
//考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
......@@ -466,10 +507,8 @@ export default {
}
} else {
//有且仅有独立层户
if (this.$refs.hBsm != undefined) {
this.$refs.hBsm.forEach((item) => {
this.zdyWidth += item.offsetWidth + 21;
});
if (this.$refs.zrzDlch != undefined) {
this.zdyWidth = this.$refs.zrzDlch.offsetWidth+20;
}
}
......@@ -504,7 +543,7 @@ export default {
});
}
} else {
// this.zdyWidth = 124;
}
},
//户单击事件
......@@ -576,8 +615,9 @@ export default {
this.lpbChLeft = e.pageX;
this.lpbChTop = e.pageY;
if (this.isHbfg) {
this.rightClickFlag = 'hb';
this.rightClickFlag = this.isHb ? 'hb':'fg';
if (this.fghbChoosedList.length>1) {
//合并
this.lpbChVisible = true;
//判断选中户可以执行的合并类型
let chIsSame = this.fghbChoosedList.every((item)=> {
......@@ -595,6 +635,22 @@ export default {
this.canHb = ''
}
})
}else{
//分割
this.lpbChVisible = true;
this.fgData.oldbsm = item.bsm;
console.log(item,'item');
//判断户的实际sjcs为1，只能水平分割
this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
if(item.sjcs == 1){
//判断户的实际sjcs为1，只能水平分割
this.fgData.fgfx = 0;
this.fgData.fghs = '';
}else{
this.fgData.fgfx = 1;
//判断户的实际sjhs不为1，分割户数为sjhs的值
this.fgData.fghs = item.sjcs;
}
}
}else{
console.log(e, "e");
......@@ -741,6 +797,25 @@ export default {
}else{
}
},
//户分割
handleFg(){
this.hfgDialogVisible = true;
},
//户分割保存
savefgData(){
hfg(this.fgData).then((res) => {
if(res.code == 200){
Message.success('分割成功');
// 清除选中户
this.hfgDialogVisible = false
this.clearChoosedH();
this.fghbChoosedList = [];
// 更新楼盘表
this.getLpb(this.zrzbsm, this.$parent.scyclx);
}
})
.catch(() => {});
}
},
computed: {
......