47cd4455 by weimo934

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue
2 parents 4fdf960f 0fa2bed3
......@@ -49,7 +49,8 @@ export function getLpb (data) {
url: 'fw/lpb/getLpb',
method: 'get',
params: {
zrzbsm:data
zrzbsm:data,
syclx:0,
},
})
}
\ No newline at end of file
......
<template>
<div class="temp">
<el-row
class="qlxzModule"
v-for="(items, index) in countList"
:key="items.id"
>
<template v-for="(childItem,childIndex) in items.list" >
<el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''">
<el-button
v-show="childIndex<1"
type="primary"
class="changeBtn"
@click="handleClick( index, 'add')"
>+</el-button
>
<el-button
v-show="childIndex<1"
type="primary"
class="changeBtn"
@click="handleClick( index, 'minus')"
>-</el-button
>
<div
:class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'"
v-if="items.isInside"
></div>
</el-col>
<el-col :span="2" class="btnCol" :key="childIndex+'8'" :class="childIndex>0 ? 'childYT':''">
<!-- <template v-if="childIndex>0"> -->
<span class="qlxz" v-show="childIndex<1">权利性质</span><br>
<el-button
type="primary"
class="changeBtn"
@click="handleInClick(index, childIndex, 'add')"
>+</el-button
>
<el-button
type="primary"
class="changeBtn"
@click="handleInClick(index, childIndex, 'minus')"
>-</el-button
>
<!-- </template> -->
</el-col>
<el-col :span="5" :key="childIndex+'7'" :class="childIndex>0 ? 'childYT':''">
<ul>
<li>批准用途</li>
<li>实际用途</li>
<li>土地使用起始时间<i class="requisite">*</i></li>
</ul>
</el-col>
<el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
<ul>
<li>
<el-select class="formSelect percent30" v-model="childItem.pzytdm">
<el-option
v-for="item in $store.state.tdytList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
</li>
<li>
<el-select class="formSelect percent30" v-model="childItem.sjytdm">
<el-option
v-for="item in $store.state.tdytList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
</li>
<li>
<el-date-picker
v-model="childItem.tdsyqssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
</el-date-picker>
</li>
</ul>
</el-col>
<el-col :span="5" :key="childIndex+'5'" :class="childIndex>0 ? 'childYT':''">
<ul>
<li>地类编码</li>
<li>地类编码</li>
<li>土地使用结束时间<i class="requisite">*</i></li>
</ul>
</el-col>
<el-col :span="5" :key="childIndex+'4'" :class="childIndex>0 ? 'childYT':''">
<ul>
<li>
<input type="text" placeholder="请输入" v-model="childItem.pzytdm" class="formInput" />
</li>
<li>
<input type="text" placeholder="请输入" v-model="childItem.sjytdm" class="formInput" />
</li>
<li>
<el-date-picker
v-model="childItem.tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
</el-date-picker>
</li>
</ul>
</el-col>
</template>
<div class="title">
<el-select class="formSelect" v-model="items.qlxzdm">
<el-option
v-for="item in $store.state.qlxzList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
</div>
</el-row>
</div>
</template>
<script>
import { getDdicByMC } from "../../api/common";
export default {
props: {
// widtd: {
// type: String,
// default: "70%",
// },
},
data() {
return {
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": ""
}
]
},
],
outNum:0
};
},
created(){
},
methods: {
//外层操作
handleClick( ind, type) {
let outsideObj = {
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": ""
}
]
};
if (type === "add") {
this.countList.push(outsideObj);
this.outNum++
} else {
this.countList.forEach((item, index) => {
if (index == ind && this.countList.length > 1) {
this.countList.splice(index, 1);
}
});
this.outNum--
}
},
//内层操作
handleInClick(index, childIndex, type) {
let insideObj = {
"pzdjbsm": "",
"pzdjmc": "",
"pzytdm": "",
"pzytmc": "",
"pzytmj": 0,
"qlxzbsm": "",
"sjdjbsm": "",
"sjdjmc": "",
"sjytdm": "",
"sjytmc": "",
"sjytmj": 0,
"syqx": "",
"tdsyjssj": "",
"tdsyqssj": "",
"tdzh": ""
};
if (type === "add") {
this.countList[index].list.splice(childIndex + 1, 0, insideObj);
} else {
this.countList[index].list.forEach((item, childInd) => {
if (childIndex == childInd && this.countList[index].list.length > 1) {
this.countList[index].list.splice(childIndex, 1);
}
});
}
this.hasBorderOrNot();
},
//判断是否显示边框
hasBorderOrNot() {
this.countList.forEach((item, index) => {
if (index == this.countList.length - 1) {
item.hasNotBorder = true;
} else {
item.hasNotBorder = item.isInside && !this.countList[index + 1].isInside ? true : false;
}
});
},
getQlxzDataList() {
return this.countList;
},
},
};
</script>
<style lang="less">
.temp {
width: 100%;
.qlxzModule {
height: auto;
position: relative;
border-bottom: 1px solid grey;
.el-col {
// height: 100%;
border-right: 1px solid grey;
position: relative;
.qlxz {
line-height: 34px;
}
ul {
margin-top: 34px;
li {
height: 37px;
line-height: 37px;
text-decoration: none;
border-bottom: 1px solid #E6E6E6;
.el-select{
width: 100%;
}
.el-input{
width: 100%;
}
.el-input__inner {
height: 34px;
}
}
li:last-child {
border-bottom: none;
}
}
.whiteItem {
background-color: #fff;
position: absolute;
width: 100%;
height: 2px;
bottom: -1px;
left: 0;
}
.itemShow {
bottom: 2px;
}
}
.childYT{
height: 114px;
border-top: 1px solid grey;
ul {
margin-top: 0;
li{
.el-input__inner {
height: 29px;
}
}
}
.changeBtn {
margin-top: -48px;
}
.el-button + .el-button {
margin-top: 4px;
}
}
.noTopBorder{
border-top: 0;
}
.noRightBorder{
border-right: 0;
}
.el-col:nth-last-child(2) {
border-right: none;
}
.title {
width: 83.33333%;
height: 34px;
line-height: 34px;
background-color: #fff;
border-bottom: 1px solid grey;
position: absolute;
right: 0;
top: 0;
.formSelect {
top: -1px;
width: 100%;
.el-input__inner {
height: 32px;
}
}
}
}
.btnCol {
position: relative;
height: 146px;
.changeBtn {
width: 46px;
height: 46px;
font-size: 30px;
padding: 4px 6px;
position: absolute;
top: 50%;
left: 50%;
margin-top: -38px;
margin-left: -23px;
}
.el-button + .el-button {
margin-left: -23px;
margin-top: 16px;
}
}
.el-row:nth-last-child(1) {
border-bottom: none;
}
}
</style>
......@@ -375,7 +375,7 @@
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
import Qlxz from "../../../components/formMenu/qlxz_simple";
export default {
name:'zrz',
components:{
......
......@@ -2,25 +2,40 @@
<div class="edit">
<div class="tab-header">
<el-row class="searchContent">
<el-col :span="10">
<el-col :span="8">
<el-radio-group v-model="tabPosition">
<el-radio-button label="sc">实测</el-radio-button>
<el-radio-button label="yc">预测</el-radio-button>
</el-radio-group>
<el-input
v-model="bdcdyh"
:style="{'width':inputWidth+'px'}"
@focus="inputFocus"
@blur="inputBlur"
@change="inputChange"
class="searchInput"
placeholder="输入不动产单元号"
></el-input>
><i slot="suffix" class="el-input__icon el-icon-search" @click="inputChange"></i></el-input>
<!-- <el-autocomplete
v-model="bdcdyh"
:style="{'width':inputWidth+'px'}"
placeholder="输入不动产单元号">
<i
class="el-icon-search el-input__icon"
slot="suffix">
</i>
</el-autocomplete> -->
</el-col>
<el-col :span="14">
<el-button class="radioBtn" label="1" @click="create" border>创建楼盘</el-button>
<el-col :span="16">
<div class="fr">
<el-button class="radioBtn" label="1" border @click="create">创建楼盘</el-button>
<el-button class="radioBtn" label="2" border>实预测转换</el-button>
<el-button class="radioBtn" label="3" border @click="plhVisible=true">批量户</el-button>
<el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
<el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
<el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button>
<el-button class="radioBtn" label="6" border>批量坐落</el-button>
<el-button class="radioBtn" label="7" border>批量单元号</el-button>
</div>
</el-col>
</el-row>
</div>
......@@ -143,6 +158,7 @@ export default {
dialogVisible: false,
menuType: "",
treeData: {},
inputWidth:74,
legendList: [
{
name: "未确权",
......@@ -297,6 +313,22 @@ export default {
legendToggle() {
this.legendToggleFlag = !this.legendToggleFlag;
},
//获取选中户bsm
getHbsm(data){
this.bsms = data;
// console.log(this.bsms);
},
inputFocus(){
this.inputWidth = 200
},
inputBlur(){
this.inputWidth = 74
},
inputChange(){
if (this.bdcdyh!='') {
console.log('查询'+this.bdcdyh);
}
}
},
computed: {
},
......@@ -335,7 +367,7 @@ export default {
margin-bottom: 20px;
.searchContent {
box-sizing: border-box;
padding-left: 20px;
padding: 0 20px;
/deep/.el-radio-button__inner {
border: 1px solid #00CACD;
color: #00CACD;
......@@ -351,7 +383,7 @@ export default {
border-color: #00CACD;
}
.searchInput {
width: 300px;
transition: .5s;
margin-left: 20px;
display: inline-block;
}
......@@ -399,13 +431,13 @@ export default {
width: 34px;
float: right;
height: 100%;
background-color: #0091FF;
color: #fff;
.btn {
cursor: pointer;
height: 40px;
line-height: 40px;
text-align: center;
background-color: #0091FF;
color: #fff;
border-bottom: 1px solid #e6e6e6;
}
.dyzt {
......@@ -419,6 +451,8 @@ export default {
.dyzt,
.fwxz,
.fwyt {
background-color: #0091FF;
color: #fff;
border-bottom: 1px solid #e6e6e6;
span {
text-align: center;
......
......@@ -13,7 +13,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)">{{hs.hh}}</td>
</tr>
</table>
<!-- 幢单元名称 -->
......@@ -37,7 +37,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)">{{hs.hh}}</td>
</tr>
</table>
<!-- 幢单元名称 -->
......@@ -53,7 +53,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)">{{hs.hh}}</td>
</tr>
</table>
</div>
......@@ -376,7 +376,8 @@ export default {
ljzWidth:10000,
zdyWidth:2000,
cHeight:0,
loading:true
loading:true,
hbsmList:[]
};
},
created() {
......@@ -396,10 +397,7 @@ export default {
getLpb(zrzbsm)
.then((res => {
if (res.code == 200) {
// console.log(this.lpbData,'前');
this.lpbData = res.result;
// this.lpbData.zdys.push(this.lpbData.zdys)
// console.log(this.lpbData,'后');
setTimeout(() => {
//计算逻辑幢宽度 20为marginRight值
this.ljzWidth -= 9980;
......@@ -422,8 +420,30 @@ export default {
});
}
}))
},
//td点击事件
handleTdClick(e,bsm){
//判断点击的户是否选中
if(e.target.className.indexOf('tdSelect') == -1){
//未选中
e.target.className = 'tdSelect'; //加边框
this.hbsmList.push(bsm) // 将户bsm放进hbsmList
}else{
//选中
e.target.className = '';
this.deleteArrOption(this.hbsmList,bsm);
}
this.$parent.getHbsm(this.hbsmList);
},
//删除多重数组中的某一项
deleteArrOption(arr, item) {
for (var i = arr.length; i > 0; i--) {
if (arr[i - 1] == item) {
arr.splice(i - 1, 1);
}
}
},
},
computed: {
createFlagChange() {
return this.$parent.createFlag;
......@@ -457,9 +477,14 @@ export default {
height: 100%;
position: relative;
overflow: scroll;
-webkit-user-select:none;
-moz-user-select:none;
-ms-user-select:none;
user-select:none;
.ljz-wrap {
height: auto;
overflow: hidden;
margin-bottom: 20px;
.ljz{
float: left;
margin-right: 20px;
......@@ -535,6 +560,11 @@ export default {
height: 64px;
line-height: 64px;
text-align: center;
cursor: pointer;
}
.tdSelect{
border: 1px solid #0091FF!important;
}
}
}
......