7fb2a076 by zhaoqian

同意水平线的问题

1 parent 70b2a021
......@@ -2,17 +2,48 @@
<div class="hb-tabs top20">
<div class="hbq">
<span class="tips" style="margin-left:0;">合并前多幢信息</span>
<table border="1">
<tr>
<td class="xh">序号</td>
<td class="zddm">宗地代码</td>
<td class="bdcdyh">不动产单元号</td>
<td class="xmmc">项目名称</td>
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="zl">类型</td>
<td class="">
<div>
<el-table
:data="dzhbqData"
border
style="width: 100%"
height="200px"
:header-cell-style="{'text-align':'center'}"
:cell-style="{'text-align':'center'}">
<el-table-column
type="index"
label="序号"
width="80">
</el-table-column>
<el-table-column
prop="zddm"
label="宗地代码">
</el-table-column>
<el-table-column
prop="bdcdyh"
label="不动产单元号"
width="350">
</el-table-column>
<el-table-column
prop="xmmc"
label="项目名称">
</el-table-column>
<el-table-column
prop="bdcqzh"
label="不动产权证号">
</el-table-column>
<el-table-column
prop="qlr"
label="权利人">
</el-table-column>
<el-table-column
prop="zl"
label="坐落">
</el-table-column>
<el-table-column
width="300">
<template slot="header" slot-scope="scope">
多幢:
<el-button
type="primary"
......@@ -27,32 +58,19 @@
@click="newAddZrz"
>+
</el-button>
</td>
</tr>
<tr v-if="dzhbqData.length==0">
<td colspan="9">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in dzhbqData" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm">{{item.zddm}}</td>
<td class="bdcdyh">{{item.bdcdyh}}</td>
<td class="xmmc">{{item.xmmc}}</td>
<td class="bdcqzh">{{item.bdcqzh}}</td>
<td class="qlr">{{item.qlr}}</td>
<td class="zl">{{item.zl}}</td>
<td class="zl">{{item.type=='zrz'?'自然幢':'多幢'}}</td>
<td class="cz">
</template>
<template slot-scope="scope">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
@click="deleteData(index)"
@click="deleteData(scope.$index)"
>-
</el-button>
</td>
</tr>
</table>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div class="hbh dzhbh">
<span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span>
......@@ -61,47 +79,47 @@
<span>多幢基本信息</span>
</div>
<ul class="zdjbxx">
<li>
<span class="label">行政区:</span>
<li >
<span class="label">行政区:</span>
<span class="value">
<el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)"
disabled>
<el-row>
<el-col :span="7" style="display: inline-block;">
<el-select v-model="dzhbhData.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(dzhbhData.xzqbsm)" disabled>
<el-option
v-for="i in xzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
v-for="item in xzq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</span>
</li>
<li>
<span class="label">地籍区:</span>
<span class="value">
<el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)"
disabled>
</el-col>
<el-col :span="1">&nbsp;</el-col>
<el-col :span="7">
<el-select v-model="dzhbhData.djqbsm" placeholder="地籍区" @change="changeDjq(dzhbhData.djqbsm)" disabled>
<el-option
v-for="i in djq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
v-for="item in djq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</span>
</li>
<li>
<span class="label">地籍子区:</span>
<span class="value">
<el-select v-model="dzhbhData.djzqbsm" @change="$forceUpdate()" disabled>
</el-col>
<el-col :span="1">&nbsp;</el-col>
<el-col :span="8">
<el-select v-model="dzhbhData.djzqbsm" placeholder="地籍子区" @change="$forceUpdate()" disabled>
<el-option
v-for="i in djzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
v-for="item in djzq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</el-col>
</el-row>
</span>
</li>
<li>
<span class="label">所有权类型:</span>
<span class="value">
......@@ -434,6 +452,7 @@
this.geZrztData(this.queryData)
},
deleteData(index) {
console.log(JSON.stringify(index)+":row")
let data = this.dzhbqData[index];
// 多幢
if (data.zrzCount) {
......
......@@ -41,5 +41,8 @@
}
background: #eaedf5;
}
/deep/ .el-tabs__item {
height: 48px;
}
}
</style>
\ No newline at end of file
......
......@@ -171,6 +171,9 @@
height: 100%;
}
background: #eaedf5;
/deep/ .el-tabs__item {
height: 48px;
}
}
.main {
width: 100%;
......
......@@ -5,53 +5,65 @@
<div class="hb-tabs top20">
<span class="tips">合并前宗地信息</span>
<div class="hbq">
<table border="1">
<tr>
<td class="xh">序号</td>
<td class="zddm">宗地代码</td>
<td class="bdcdyh">不动产单元号</td>
<td class="xmmc">项目名称</td>
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td>
<el-table
:data="zdhbqData"
border
style="width: 100%"
height="200px"
:header-cell-style="{'text-align':'center'}"
:cell-style="{'text-align':'center'}">
<el-table-column
type="index"
label="序号"
width="80">
</el-table-column>
<el-table-column
prop="zddm"
label="宗地代码">
</el-table-column>
<el-table-column
prop="bdcdyh"
label="不动产单元号"
width="350">
</el-table-column>
<el-table-column
prop="xmmc"
label="项目名称">
</el-table-column>
<el-table-column
prop="bdcqzh"
label="不动产权证号">
</el-table-column>
<el-table-column
prop="qlr"
label="权利人">
</el-table-column>
<el-table-column
prop="zl"
label="坐落">
</el-table-column>
<el-table-column>
<template slot="header" slot-scope="scope">
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="newAdd"
>+
</el-button>
</td>
</tr>
<tr v-if="zdhbqData.length==0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in zdhbqData" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
readonly="readonly"/></td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
readonly="readonly"/></td>
<td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
readonly="readonly"/></td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
readonly="readonly"/></td>
<td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz">
</template>
<template slot-scope="scope">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
@click="deleteData(item,index)"
>-
</el-button>
</td>
</tr>
</table>
</template>
</el-table-column>
</el-table>
</div>
<span class="tips">合并后宗地信息</span>
<div class="hbh">
......@@ -60,45 +72,51 @@
<span>宗地基本信息</span>
</div>
<ul class="zdjbxx">
<li>
<span class="label">行政区:</span>
<li >
<span class="label">行政区划:</span>
<span class="value">
<el-select v-model="zdhbhData.xzqbsm" @change="changeXzq(zdhbhData.xzqbsm)">
<el-row>
<el-col :span="7" style="display: inline-block;">
<el-select v-model="zdhbhData.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(zdhbhData.xzqbsm)">
<el-option
v-for="i in xzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
v-for="item in xzq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</span>
</li>
<li>
<span class="label">地籍区:</span>
<span class="value">
<el-select v-model="zdhbhData.djqbsm" @change="changeDjq(zdhbhData.djqbsm)">
</el-col>
<el-col :span="1">&nbsp;</el-col>
<el-col :span="7">
<el-select v-model="zdhbhData.djqbsm" placeholder="地籍区" @change="changeDjq(zdhbhData.djqbsm)">
<el-option
v-for="i in djq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
v-for="item in djq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</span>
</li>
<li>
<span class="label">地籍子区:</span>
<span class="value">
<el-select v-model="zdhbhData.djzqbsm" @change="$forceUpdate()">
</el-col>
<el-col :span="1">&nbsp;</el-col>
<el-col :span="8">
<el-select v-model="zdhbhData.djzqbsm" placeholder="地籍子区" @change="$forceUpdate()">
<el-option
v-for="i in djzq"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
v-for="item in djzq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</el-col>
</el-row>
</span>
</li>
<li>
<span class="label">所有权类型:</span>
<span class="value">
......@@ -237,6 +255,7 @@
})
},
methods: {
handleClick(tab, event) {
if (tab.name === 'h') {
this.hhbtabs = true
......@@ -663,6 +682,7 @@
}
.hbq {
margin: 14px 20px 20px 20px;
height: 200px;
}
.dzhbh {
box-sizing: border-box !important;
......
......@@ -68,5 +68,8 @@ export default {
}
background: #eaedf5;
}
/deep/ .el-tabs__item {
height: 48px;
}
}
</style>
......
......@@ -239,6 +239,9 @@
height: 100%;
}
background: #eaedf5;
/deep/ .el-tabs__item {
height: 48px;
}
}
.main {
width: 100%;
......
......@@ -197,6 +197,9 @@
}
background: #eaedf5;
}
/deep/ .el-tabs__item {
height: 48px;
}
.main {
width: 100%;
height: 100%;
......