d1365a65 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents b3718a72 73b5e427
......@@ -20,7 +20,7 @@ export function updateQjH(data) {
return request({
url: '/system/qjH/updateQjH',
method: 'put',
data:data
data: data
})
}
......@@ -31,6 +31,17 @@ export function batchUpdateQjH(data) {
return request({
url: '/system/qjH/batchH',
method: 'post',
data:data
data: data
})
}
/**
* 自然幢重新落宗
*/
export function zrzcxlz(data) {
return request({
url: '/fw/qjZrz/zrzcxlz',
method: 'put',
data: data
})
}
......
......@@ -19,6 +19,9 @@
.db{
display: block;
}
.dn{
display: none;
}
.fl{
float: left;
}
......@@ -32,15 +35,20 @@ table,td,tr,.el-col,.title{
border-color: #E6E6E6 !important;
}
.formInput {
height: 20px;
width: 96%;
height: 100%;
width: 100%;
line-height: 20px;
outline: none;
border: none;
color: #606764;
overflow: visible;
cursor: text;
text-align: center;
text-align: left;
text-indent: 20px;
padding: 0;
}
.formInput:focus{
border: 1px solid #A0C5F6!important;
}
.psr{
position: relative;
......
<template>
<div>
<el-dialog
title="选择宗地"
:visible.sync="isVisible"
width="50%"
@close="close"
:modal-append-to-body="false"
>
<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>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</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>{{index+1}}</td>
<td @click="select(item)" class="xz">
<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>
<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>
<script>
import {getSearchList} from './../../api/search'
import {zrzcxlz} from './../../api/h'
import {Message} from 'element-ui'
export default {
name: "cxlzQueryData",
data() {
return {
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: ""
},
Data: [],
isVisible: false,
zdbsm:''
}
},
props: {
centerDialogVisible: {
type: Boolean,
default: function () {
return false
}
},
dylxs: {
type: Array,
default: function () {
return ['zd']
}
},
zrzbsm: {
type: String
}
},
mounted() {
this.getData(this.queryData)
},
created() {
},
methods: {
select: function (val) {
this.zdbsm = val.glbsm
},
save: function () {
zrzcxlz({
zdBsm: this.zdbsm,
zrzBsm: this.zrzbsm
}).then(res => {
if (res.success) {
this.close()
} else {
Message.error(res.message)
}
})
},
result: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: ""
};
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
this.Data = res.result.records
})
},
search: function () {
this.getData(this.queryData)
},
close: function () {
this.$emit('close')
this.result();
this.isVisible = false
}
},
watch: {
centerDialogVisible(val) {
this.isVisible = val
}
}
}
</script>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.shop {
margin-top: 20px;
}
.xz {
color: blue;
}
.noData {
color: #b2b2b2;
}
.footer-button {
text-align: center;
margin-top: 20px;
}
</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>
......@@ -44,7 +44,7 @@
</el-select>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fghB"/>
<input type="text" class="inputtitle" v-model="plshData.fgfB"/>
</td>
<td>
......
<template>
<div class="main">
<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>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</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>{{index+1}}</td>
<td @click="addData(item)" class="xz">
<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>
<span slot="footer" class="dialog-footer">
</span>
</div>
</template>
<script>
export default {
name: "query"
}
</script>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.shop {
margin-top: 20px;
}
.xz {
color: blue;
}
.noData {
color: #b2b2b2;
}
</style>
......@@ -110,17 +110,18 @@ export default {
};
},
created() {
},
mounted() {
let self = this;
document.onkeydown = function(e) {
//按下回车提交
let key = window.event.keyCode;
//事件中keycode=13为回车事件
if (key == 13) {
self.onSubmit();
// self.onSubmit();
}
};
},
mounted() {},
methods: {
//重置
reset() {
......
<template>
<div class="">重新落宗</div>
<div class="main">
<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>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</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>{{index+1}}</td>
<td @click="xzzrz(item)" class="xz">
<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>
<span slot="footer" class="dialog-footer">
</span>
<cxlz-query-data :centerDialogVisible="centerDialogVisible" :dylxs="dylxs" @close="close"
:zrzbsm="zrzbsm"></cxlz-query-data>
<div>
<el-pagination
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page.sync="queryData.pageNo"
:page-size="queryData.pageSize"
layout="total, prev, pager, next"
:total="total">
</el-pagination>
</div>
</div>
</template>
<script>
export default {
name:"",
components:{},
props:{},
data(){
import {getSearchList} from './../../../../api/search'
import cxlzQueryData from "../../../../components/cxlxQueryData/cxlzQueryData";
export default {
name: "",
components: {cxlzQueryData},
props: {},
data() {
return {
total: 1,
centerDialogVisible: false,
zrzbsm: "",
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zrz'],
qlrmc: "",
qszt: "",
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 5
},
Data: [],
dylxs: ['zd']
}
},
created(){},
mounted(){},
methods:{},
created() {
},
mounted() {
this.getData(this.queryData)
},
methods: {
sizeChange: function (val) {
console.log(`每页 ${val} 条`);
this.queryData.pageSize = val
},
currentChange: function (val) {
console.log(`当前页: ${val}`);
this.queryData.pageNo = val
this.getData(this.queryData)
},
xzzrz: function (item) {
this.centerDialogVisible = true;
this.zrzbsm = item.glbsm;
},
close: function () {
this.centerDialogVisible = false;
},
result: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zrz'],
qlrmc: "",
qszt: "",
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10
};
this.getData(this.queryData)
},
getData: function (data) {
getSearchList(data).then(res => {
this.Data = res.result.records
this.total = res.total
})
},
search: function () {
this.getData(this.queryData)
},
},
computed: {},
watch: {},
}
}
</script>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.shop {
margin-top: 20px;
}
.xz {
color: blue;
}
.noData {
color: #b2b2b2;
}
</style>
......
......@@ -346,6 +346,12 @@ export default {
inputChange(){
if (this.bdcdyh!='') {
console.log('查询'+this.bdcdyh);
this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
}else{
this.$message({
message: "请输入内容后查询",
type: "warning",
})
}
},
//户保存
......
......@@ -14,7 +14,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
<!-- </div> -->
......@@ -30,7 +30,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
</div>
......@@ -55,7 +55,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
</div>
......@@ -67,7 +67,7 @@
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
</tr>
</table>
</div>
......@@ -107,6 +107,7 @@ export default {
loading:true,
hbsmList:[],
time:null, //区分单双击事件的定时器
searchNum:Math.random()
};
},
created() {
......@@ -140,6 +141,11 @@ export default {
}
}))
},
//按照bdcdyh或shbw筛选户
lpbDataMap(sh){
// console.log('查询'+sh);
this.searchNum = sh;
},
//自然幢下元素高度宽度计算
dataChange(){
//计算逻辑幢宽度 20为marginRight值
......@@ -207,17 +213,16 @@ export default {
self.time = setTimeout(() => {
//判断点击的户是否选中
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,false);
}, 200);
},
//户双击事件
dbclick(bsm){
......@@ -253,6 +258,22 @@ export default {
this.lpbContentWidth = this.$refs.lpbContent.offsetWidth -6;
}, 501);
},
//监听有无通过输入框查询选择到的户,如果有,将其bsm放入hbsmList
searchNum(n){
console.log(this.$refs.hBsm,'this.$refs.hBsm');
this.$nextTick(()=>{
this.$refs.hBsm.forEach(item=>{
console.log(item.dataset,'item');
if(item.dataset.bsm != ''){
console.log(item.dataset.bsm,'item.dataset.bsm');
// 判断hbsmList中是否已经存在
if(this.hbsmList.indexOf(item.dataset.bsm) == -1){
this.hbsmList.push(item.dataset.bsm) // 将户bsm放进hbsmList
}
}
})
})
}
},
};
</script>
......