6abea490 by zhaoqian

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue
2 parents 75380635 394d00d3
......@@ -48,14 +48,14 @@
</el-row>
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<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="cz">操作</td>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
......@@ -63,16 +63,16 @@
</td>
</tr>
<tr v-else v-for="(item,index) in Data" :key="index">
<td>{{index+1}}</td>
<td @click="select(item)" class="xz">
<span>选择</span>
<td class="xh">{{index+1}}</td>
<td class="zddm" :title="item.zddm">{{item.zddm}}</td>
<td class="bdcqdyh" :title="item.bdcdyh">{{item.bdcdyh}}</td>
<td class="xmmc" :title="item.xmmc">{{item.xmmc}}</td>
<td class="bdcqzh" :title="item.bdcqzd">{{item.bdcqzh}}</td>
<td class="qlr" :title="item.qlr">{{item.qlr}}</td>
<td class="zl" :title="item.zl">{{item.zl}}</td>
<td @click="saveNotarize(item)" class="cz">
<span>落宗</span>
</td>
<td>{{item.zddm}}</td>
<td>{{item.bdcdyh}}</td>
<td>{{item.xmmc}}</td>
<td>{{item.bdcqzh}}</td>
<td>{{item.qlr}}</td>
<td>{{item.zl}}</td>
</tr>
</table>
</div>
......@@ -86,10 +86,6 @@
>
</el-pagination>
</div>
<div class="footer-button">
<el-button type="primary" @click="save">确认</el-button>
<el-button type="primary" @click="close">取消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -144,13 +140,25 @@
created() {
},
methods: {
saveNotarize: function (val) {
this.zdbsm = val.glbsm;
this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.save();
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
currentChange: function (val) {
this.queryData.pageNo = val;
this.getData(this.queryData);
},
select: function (val) {
this.zdbsm = val.glbsm
},
save: function () {
zrzcxlz({
zdBsm: this.zdbsm,
......@@ -216,6 +224,9 @@
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
background-color: #F5F7FA;
}
}
td {
......@@ -248,8 +259,38 @@
height: 650px;
}
.footer-button {
text-align: center;
margin-top: 20px;
.xh {
width: 50px;
}
.zddm {
width: 120px;
}
.bdcdyh {
width: 180px;
}
.xmmc {
width: 100px;
}
.bdcqzh {
width: 100px;
}
.qlr {
width: 100px;
}
.zl {
width: 100px;
}
.cz {
width: 50px;
span {
color: blue;
}
}
</style>
......
<template>
<div class="main">
<div class='input' contenteditable placeholder='请输入文字'>
<div @mouseover="mouseover($event)" @mouseleave="mouseLeave($event)" v-for="(item,index) in datas"
:key="index" style="float: left;"
class="item">
{{item}};
<div style="float: right;display: none" @click="itemClick(index)">X</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "emailInput",
data() {
return {
datas: ['111', '222', '333', '444', '555', '666', '777', '888', '999'],
}
},
props: {},
methods: {
mouseover(e) {
// e.target 是你当前点击的元素
// 是你绑定事件的元素
let dom = e.currentTarget.firstElementChild
dom.style = "float: right;display: block";
// 获得点击元素的前一个元素
/* e.currentTarget.previousElementSibling.innerHTML
// 获得点击元素的第一个子元素
e.currentTarget.firstElementChild
// 获得点击元素的下一个元素
e.currentTarget.nextElementSibling
// 获得点击元素中id为string的元素
e.currentTarget.getElementById("string")
// 获得点击元素的string属性
e.currentTarget.getAttributeNode('string')
//获得点击元素的父级元素
e.currentTarget.parentElement
// 获得点击元素的前一个元素的第一个子元素的HTML值
e.currentTarget.previousElementSibling.firstElementChild.innerHTML*/
},
mouseLeave(e) {
let dom = e.currentTarget.firstElementChild
dom.style = "float: right;display: none"
},
itemClick(index){
this.datas.splice(index,1)
}
},
computed: {
text: function () {
let text = "";
for (let item of this.datas) {
text += item + ";";
}
return text;
}
}
}
</script>
<style scoped lang="less">
.main {
.input {
width: auto;
height: 24px;
line-height: 24px;
font-size: 14px;
padding: 5px 8px;
border: 1px solid #ddd;
}
.input:empty::before {
content: attr(placeholder);
}
.item{
cursor: pointer;
}
.item:hover {
border: 1px solid #BBF;
}
}
</style>
<template>
<div class="main">
<el-dialog
title="户重新落宗"
:visible.sync="isVisible"
width="50%"
@close="close"
:modal-append-to-body="false"
>
<div class="content">
<div class="input-suffix">
宗 地:
<input
placeholder="请选择宗地" v-model="hcxlzData.zdbsm" readonly="readonly"
/>
<el-button type="primary" @click="drawer = true">选择宗地</el-button>
</div>
<div class="input-suffix">
自然幢:
<el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择">
<el-option
v-for="item in zrzList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div class="input-suffix">
逻辑幢:
<el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择">
<el-option
v-for="item in ljzList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div class="input-suffix">
幢单元:
<el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择">
<el-option
v-for="item in zdyList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</div>
<div class="footer">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
<el-drawer
title="选择宗地"
:visible.sync="drawer"
direction="rtl"
size="25%"
:before-close="drawerClose">
<div>
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
不动产权证号:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.bdcqzh"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
不动产权单元号:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.bdcdyh"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
权利人:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.qlrmc"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
坐落:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
</el-col>
</el-row>
<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="cz">操作</td>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in Data" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm" :title="item.zddm">{{item.zddm}}</td>
<td class="bdcqdyh" :title="item.bdcdyh">{{item.bdcdyh}}</td>
<td class="xmmc" :title="item.xmmc">{{item.xmmc}}</td>
<td class="bdcqzh" :title="item.bdcqzd">{{item.bdcqzh}}</td>
<td class="qlr" :title="item.qlr">{{item.qlr}}</td>
<td class="zl" :title="item.zl">{{item.zl}}</td>
<td @click="saveNotarize(item)" class="cz">
<span>落宗</span>
</td>
</tr>
</table>
</div>
<div class="page">
<el-pagination
background
layout="prev, pager, next,total"
:page-size="queryData.pageSize"
:total="total"
@current-change="currentChange"
>
</el-pagination>
</div>
</div>
</el-drawer>
</el-dialog>
</div>
</template>
<script>
export default {
name: "hCxlz",
data() {
return {
drawer: false,
isVisible: false,
hcxlzData: {
bsms: [],
zdbsm: '',
zrzbsm: '',
ljzbsm: '',
zdybsm: ''
},
total: 1,
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10,
},
Data: [],
zrzList: [],
ljzList: [],
zdyList: []
}
},
props: {
hCxlzVisble: {
type: Boolean,
default: false
},
bsms: {
type: Array
}
},
mounted() {
},
methods: {
result: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10,
};
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
},
search: function () {
this.getData(this.queryData)
},
drawerClose(done) {
this.$confirm('确认关闭?')
.then(_ => {
done();
})
.catch(_ => {
});
},
cancel() {
console.log("cancel......")
},
save() {
console.log("save.......")
},
close() {
this.$emit('close', false);
this.isVisible = false;
},
},
watch: {
hCxlzVisble: function (val) {
this.isVisible = val
}
}
}
</script>
<style scoped lang="less">
.input-suffix {
input {
width: 210px;
height: 30px;
border-radius: 3px;
border-color: #BBB;
}
}
.content {
text-align: center;
}
.footer {
margin-top: 20px;
text-align: center;
}
</style>
......@@ -176,6 +176,9 @@
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
background-color: #F5F7FA;
}
}
td {
......
......@@ -44,7 +44,8 @@ const store = new Vuex.Store({
zjlxList: [],
gyfsList: [],
hbsm:'',
contentWidth:'' //内容区域宽度
contentWidth:'', //内容区域宽度
zrzh:'' //自然幢号
},
modules: {
user,
......
......@@ -41,14 +41,14 @@
</el-row>
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<td class="xh">序号</td>
<td class="cz">操作</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>
</tr>
<tr v-if="Data.length == 0">
<td colspan="8">
......@@ -56,16 +56,16 @@
</td>
</tr>
<tr v-else v-for="(item, index) in Data" :key="index">
<td>{{ index + 1 }}</td>
<td @click="xzzrz(item)" class="xz">
<td class="xh">{{ index + 1 }}</td>
<td @click="xzzrz(item)" class="cz">
<span>选择</span>
</td>
<td>{{ item.zddm }}</td>
<td>{{ item.bdcdyh }}</td>
<td>{{ item.xmmc }}</td>
<td>{{ item.bdcqzh }}</td>
<td>{{ item.qlr }}</td>
<td>{{ item.zl }}</td>
<td class="zddm" :title="item.zddm">{{ item.zddm }}</td>
<td class="bdcdyh" :title="item.bdcdyh">{{ item.bdcdyh }}</td>
<td class="xmmc" :title="item.xmmc">{{ item.xmmc }}</td>
<td class="bdcqzh" :title="item.bdcqzh ">{{ item.bdcqzh }}</td>
<td class="qlr" :title="item.qlr">{{ item.qlr }}</td>
<td class="zl">{{ item.zl }}</td>
</tr>
</table>
</div>
......@@ -107,7 +107,7 @@
bdcqzh: "",
dylxs: ["zrz"],
qlrmc: "",
qszt: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: "",
......@@ -142,7 +142,7 @@
bdcqzh: "",
dylxs: ["zrz"],
qlrmc: "",
qszt: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: "",
......@@ -178,12 +178,19 @@
background-color: #fff;
font-size: 14px;
width: 100%;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
table-layout: fixed;
tr:hover{
background-color: #F5F7FA;
}
td, th {
text-align: center;
height: 36px;
min-width: 50px;
overflow: hidden;
white-space: nowrap;
-ms-text-overflow: ellipsis;
text-overflow: ellipsis;
}
}
table:hover {
......@@ -198,8 +205,39 @@
margin-top: 20px;
}
.xz {
color: blue;
.xh {
width: 50px;
}
.zddm {
width: 120px;
}
.bdcdyh {
width: 180px;
}
.xmmc {
width: 100px;
}
.bdcqzh {
width: 100px;
}
.qlr {
width: 100px;
}
.zl {
width: 100px;
}
.cz {
width: 50px;
span {
color: blue;
}
}
.noData {
......
......@@ -10,25 +10,25 @@
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="4" >
<el-input v-model="form.zddm" disabled></el-input>
<el-input v-show="false" v-model="form.zdbsm"></el-input>
<input v-model="form.zddm" class="formInput" disabled>
<input v-show="false" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" align="center" >自然幢号</td>
<td colspan="4" >
<el-input v-model="form.zrzh" style="width: 70%"></el-input>
<input class="formInput" v-model="form.zrzh" style="width: 70%">
<el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >项目名称</td>
<td colspan="4" >
<el-input v-model="form.xmmc"></el-input>
<input class="formInput" v-model="form.xmmc">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
<td colspan="4" >
<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
<el-input v-show="false" v-model="form.dyhbsm" style="width: 70%"></el-input>
<input class="formInput percent78" v-model="form.bdcdyh" style="width: 70%">
<input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%">
<el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
</td>
</tr>
......@@ -36,18 +36,18 @@
<tr height="30">
<td colspan="2" align="center" >建筑物名称</td>
<td colspan="4" >
<el-input v-model="form.jzwmc"></el-input>
<input class="formInput" v-model="form.jzwmc">
</td>
<td colspan="2" align="center" >建筑物基本用途</td>
<td colspan="4" >
<el-input v-model="form.jzwjbyt"></el-input>
<input class="formInput" v-model="form.jzwjbyt">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋性质</td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" >
<el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -69,62 +69,62 @@
<tr height="30">
<td colspan="2" align="center" >建筑物高度(m)</td>
<td colspan="4" >
<el-input v-model="form.jzwgd"></el-input>
<input class="formInput" v-model="form.jzwgd">
</td>
<td colspan="2" align="center" >总套数</td>
<td colspan="4" >
<el-input v-model="form.zts"></el-input>
<input class="formInput" v-model="form.zts">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >幢用地面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.zydmj"></el-input>
<input class="formInput" v-model="form.zydmj">
</td>
<td colspan="2" align="center" >幢占用地面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.zzdmj"></el-input>
<input class="formInput" v-model="form.zzdmj">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >预测建筑面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.ycjzmj"></el-input>
<input class="formInput" v-model="form.ycjzmj">
</td>
<td colspan="2" align="center" >实测建筑面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.scjzmj"></el-input>
<input class="formInput" v-model="form.scjzmj">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >地下层数</td>
<td colspan="4" >
<el-input v-model="form.dxcs"></el-input>
<input class="formInput" v-model="form.dxcs">
</td>
<td colspan="2" align="center" >地上层数</td>
<td colspan="4" >
<el-input v-model="form.dscs"></el-input>
<input class="formInput" v-model="form.dscs">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >总层数</td>
<td colspan="4" >
<el-input v-model="form.zcs"></el-input>
<input class="formInput" v-model="form.zcs">
</td>
<td colspan="2" align="center" >地下深度(m)</td>
<td colspan="4" >
<el-input v-model="form.dxsd"></el-input>
<input class="formInput" v-model="form.dxsd">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >产别</td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" >
<el-select class="formInput" v-model="form.fwcbbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -135,7 +135,7 @@
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" >
<el-select class="formInput" v-model="form.fwcqlybsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -157,7 +157,7 @@
规划用途
</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
<el-select-tree class="formInput"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -172,7 +172,7 @@
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
<el-select-tree class="formInput"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -196,7 +196,7 @@
<span @click="deleteFwjgInfo(index)">删除</span>
</td>
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-select class="persent78" v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.jgOptions"
:key="item.bsm"
......@@ -221,7 +221,7 @@
<span>坐落</span>
</td>
<td colspan="10" >
<el-input v-model="form.zl"></el-input>
<input class="formInput" v-model="form.zl">
</td>
</tr>
......@@ -230,7 +230,7 @@
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
<el-input v-model="form.bz" type="textarea"></el-input>
<input class="formInput" v-model="form.bz" type="textarea">
</td>
</tr>
<tr height="30">
......@@ -241,7 +241,7 @@
<span>调查意见</span>
</td>
<td colspan="10" >
<el-input v-model="form.dcyj"></el-input>
<input class="formInput" v-model="form.dcyj">
</td>
</tr>
......@@ -250,7 +250,7 @@
<span>审查员</span>
</td>
<td colspan="2" >
<el-input v-model="form.scy"></el-input>
<input class="formInput" v-model="form.scy">
</td>
<td colspan="2" align="right" style="width:8.33%;padding-right:10px">
<span>审查日期</span>
......@@ -590,6 +590,10 @@
.zrzTable{
margin-top: 10px;
td{
text-align: center;
height: 36px;
}
}
}
</style>
\ No newline at end of file
......