Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
e7210d3a by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents f73eb8da 6a5d2671
Inline Side-by-side
Showing 2 changed files with 3 additions and 199 deletions
......@@ -171,48 +171,6 @@
</tr>
</table>
</div>
<el-dialog
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
width="50%"
:modal-append-to-body="false"
center>
<div class="xz-container">
<div class="xz-main">
<table border="1">
<tr>
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
<el-option
v-for="i in ztypes"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td>
<input type="text" class="formInput"
v-model="item.zbsm"/>
</td>
</tr>
</table>
</div>
<div class="xz-sidebar">
<el-tree :data="zrzData" :props="defaultProps" @node-click="handleNodeClick"
node-key="id"
:default-expand-all="true"></el-tree>
</div>
</div>
</el-dialog>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
......@@ -333,7 +291,6 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<!-- {{item.fwlist.zbsm}}-->
<span @click="xzzrz(index)" class="xz">选择</span>
</td>
</tr>
......@@ -356,47 +313,6 @@
</tr>
</table>
</div>
<el-dialog
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
:modal-append-to-body="false"
width="50%"
center>
<div class="xz-container">
<div class="xz-main">
<table border="1">
<tr>
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
<el-option
v-for="i in ztypes"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td>
<input type="text" class="formInput"
v-model="item.zbsm"/>
</td>
</tr>
</table>
</div>
<div class="xz-sidebar">
<el-tree :data="zrzData" :props="defaultProps" @node-click="handleNodeClick"
:default-expand-all="true"></el-tree>
</div>
</div>
</el-dialog>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
:isZdClose="true"
@close="close"></query-data>
......@@ -542,50 +458,8 @@
</tr>
</table>
</div>
<el-dialog
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
:modal-append-to-body="false"
width="50%"
>
<div class="xz-container">
<div class="xz-main">
<table border="1">
<tr>
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
<el-option
v-for="i in ztypes"
:key="i.value"
:label="i.label"
:value="i.value"
></el-option>
</el-select>
</td>
<td>
<input type="text" class="formInput"
v-model="item.zbsm"/>
</td>
</tr>
</table>
</div>
<div class="xz-sidebar">
<el-tree :data="zrzData" :props="defaultProps" @node-click="handleNodeClick"
:default-expand-all="true"></el-tree>
</div>
</div>
</el-dialog>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
:isZdClose="true"
@close="close"></query-data>
:isZdClose="true" @close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
......@@ -616,9 +490,7 @@
data() {
return {
tabName: 'zd',
isopenXz: false,
centerDialogVisible: false,
selectIndex: 0,// 当前选中序号
zdFgqData: {}, // 宗地分割前数据
dzFgqData: {}, //多幢分割前数据
hFgqData: {}, // 户分割前数据
......@@ -637,50 +509,6 @@
children: 'children',
label: 'label'
},
zrzData: [{
id: 1,
label: '一级 1',
children: [{
id: 4,
label: '二级 1-1',
children: [{
id: 9,
label: '三级 1-1-1'
}, {
id: 10,
label: '三级 1-1-2'
}]
}]
}, {
id: 2,
label: '一级 2',
children: [{
id: 5,
label: '二级 2-1'
}, {
id: 6,
label: '二级 2-2'
}]
}, {
id: 3,
label: '一级 3',
children: [{
id: 7,
label: '二级 3-1'
}, {
id: 8,
label: '二级 3-2'
}]
}],
ztypes: [
{
label: '多幢',
value: '多幢'
}, {
label: '自然幢',
value: '自然幢'
}
],
syq: [
{
label: "国家所有",
......@@ -801,28 +629,6 @@
}
);
},
/**
* 删除节点
*
*/
delNode(node, data) {
},
/**
* 添加节点
*
*/
addNode(data) {
},
/**
* 选择幢信息
* @param index 当前选中行
*/
xzzrz(index) {
this.isopenXz = true
this.selectIndex = index
},
save() {
switch (this.tabName) {
case "zd":
......@@ -1070,7 +876,6 @@
hFgqData: {
handler: function (item) {
this.hFgqData.oldZdbsm = item.glbsm;
console.log(item.glbsm, "户bsm")
this.getHZdxx(item.glbsm);
},
deep: true
......@@ -1146,8 +951,9 @@
li {
padding: 5px;
line-height: 20px;
color: #BBB;
span{
color: #000;
}
}
}
......
......@@ -557,8 +557,6 @@
this.centerDialogVisible = true;
},
getData: function (data) {
console.log(data,'data')
console.log(this.zdhbqData,'宗地合并前数据')
let arr=[];
switch (this.tabName) {
case "zd":
......