Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
6fed58f4 by 焦泽平
Options

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

2 parents b898285a 111d9962
Inline Side-by-side
Showing 1 changed file with 83 additions and 46 deletions
......@@ -19,19 +19,21 @@
<div class="zxx">
<div class="dz">
<div class="title">
<span>多幢信息({{zdZxx.zrzList.length}}个)</span>
<span>多幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="[{'border':'((index+1)%2) == 0'},{'nosearch':zdDzList.includes(item)}]"
>{{item.xmmc}}</li>
</ul>
</div>
<div class="zrz">
<div class="title">
<span>自然幢信息({{zdZxx.dzList.length}}个)</span>
<span>自然幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'border'">{{item.xmmc}}
<li v-for="(item,index) in zdZxx.zrzList" :key="index"
:class="[{'border':'((index+1)%2) == 0'},{'nosearch':zdZrzList.includes(item)}]">{{item.xmmc}}
</li>
</ul>
</div>
......@@ -49,6 +51,7 @@
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
<th class="">选择</th>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
<td class="cz">
......@@ -114,33 +117,36 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<!--<el-select placeholder="请选择多幢" @change="xzDz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm">
<el-option
v-for="i in zdZxx.dzList"
:key="i.bsm"
:label="i.xmmc"
:value="i.bsm">
</el-option>
</el-select>
<el-select placeholder="请选择自然幢" @change="xzZrz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm">
<el-option
v-for="i in zdZxx.zrzList"
:key="i.bsm"
:label="i.xmmc"
:value="i.bsm">
</el-option>
</el-select>-->
<!-- <span @click="xzzrz(index)" class="xz">选择</span>-->
<el-dropdown @command="handleCommand">
<span>多幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex">{{dzItem}}</li>
</ul>
<span>自然幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.zrz" :key="dzIndex">{{dzItem}}</li>
</ul>
</td>
<td class="">
<el-dropdown @command="dzHandleCommand($event,index)">
<span class="el-dropdown-link">
选择多幢<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(ce,index) in zdZxx.dzList" :key="index" :command="ce" >{{ce.xmmc}}</el-dropdown-item>
<!--<el-dropdown-item command="b">狮子头</el-dropdown-item>
<el-dropdown-item command="c">螺蛳粉</el-dropdown-item>
<el-dropdown-item command="d" disabled>双皮奶</el-dropdown-item>
<el-dropdown-item command="e" divided>蚵仔煎</el-dropdown-item>-->
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(childItem,childIndex) in zdDzList"
:key="childIndex" :command="childItem.bsm">
{{childItem.xmmc}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown @command="zrzHandleCommand($event,index)">
<span class="el-dropdown-link">
选择自然幢<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(childItem,childIndex) in zdZrzList"
:key="childIndex" :command="childItem.bsm">
{{childItem.xmmc}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</td>
......@@ -616,6 +622,8 @@
zdFgqData: {}, // 宗地分割前数据
dzFgqData: {}, //多幢分割前数据
hFgqData: {}, // 户分割前数据
zdZrzList: [], // 宗地自然幢集合
zdDzList: [], // 宗地多幢集合
zdZxx: {
zrzList: [],
dzList: []
......@@ -722,27 +730,47 @@
})
},
methods: {
xzDz(bsm,index){
xzDz(bsm, index) {
this.zdFghData.newZdlist.fwlist[index].push({
zbsm:bsm,
ztype:'dz'
zbsm: bsm,
ztype: 'dz'
})
console.log(this.zdFghData,'zdFghData')
console.log(this.zdFghData, 'zdFghData')
},
xzZrz(bsm,index){
xzZrz(bsm, index) {
this.zdFghData.newZdlist.fwlist[index].push({
zbsm:bsm,
ztype:'zrz'
zbsm: bsm,
ztype: 'zrz'
})
console.log(this.zdFghData,'zdFghData')
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'
});
this.zdFghData.newZdlist[index].dz.push(item.xmmc)
this.zdDzList = this.zdDzList.filter(i => i.bsm !== command);
},
handleCommand(command) {
this.$message('click on item ' + command);
zrzHandleCommand(command, index) {
let item = this.zdZrzList.filter(i => i.bsm == command)[0];
this.zdFghData.newZdlist[index].fwlist.push({
zbsm: command,
ztype: 'zrz'
})
this.zdFghData.newZdlist[index].zrz.push(item.xmmc)
this.zdZrzList = this.zdZrzList.filter(i => i.bsm !== command);
},
ZdgetDzXx(zdbsm) {
ZdfggetZxx(zdbsm).then(res => {
if (res.success) {
this.zdZxx = res.result;
this.zdZrzList = res.result.zrzList
this.zdDzList = res.result.dzList
}
})
},
......@@ -813,8 +841,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
this.checkedData.fwlist = []
})
},
getDzZdjbxx(id) {
......@@ -822,8 +852,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
this.checkedData.fwlist = []
})
},
getHZdxx(id) {
......@@ -831,8 +863,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
this.checkedData.fwlist = []
})
},
getzdtzm() {
......@@ -912,10 +946,10 @@
zdtzmbsm: "",
userbsm: "",
fwlist: [
{
/* {
zbsm: "",
ztype: ""
}
}*/
]
});
this.changeXzq(this.checkedData.xzqbsm)
......@@ -1123,7 +1157,7 @@
padding: 5px;
text-align: center;
line-height: 20px;
color: #BBB;
}
}
}
......@@ -1137,7 +1171,7 @@
width: 48%;
text-align: center;
display: inline-block;
color: #BBB;
}
}
}
......@@ -1259,4 +1293,7 @@
.xzq, .djq, .djzq {
width: 150px;
}
.nosearch{
color: #000 !important;
}
</style>
......