590e6aff by 杨威

合并更改

2 parents 9920fe4d f4a2410d
import request from '@/plugin/axios'
/**
* 查询所有行政区
* 综合查询
*/
export function getSearchList(data) {
return request({
......@@ -8,4 +8,4 @@ export function getSearchList(data) {
method: 'post',
data : data,
})
}
\ No newline at end of file
}
......
<template>
<div>
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
@close="close"
center>
<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>
</el-dialog>
</div>
</template>
<script>
import {getSearchList} from './../../api/search'
export default {
name: "queryData",
data() {
return {
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: ""
},
Data: [],
isVisible: false
}
},
props: {
centerDialogVisible: {
type: Boolean,
default: function () {
return false
}
}
},
mounted() {
this.getData(this.queryData)
},
created() {
},
methods: {
result: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: ""
}
},
getData: function (data) {
getSearchList(data).then(res => {
this.Data = res.result.records
})
},
search: function () {
this.getData(this.queryData)
},
addData: function (val) {
this.$emit("getData", val)
},
close: function () {
this.$emit('close')
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;
}
.shop {
margin-top: 20px;
}
.xz {
color: blue;
}
.noData {
color: #b2b2b2;
}
</style>
......@@ -29,5 +29,9 @@ let bdcLxArray = [
label: "自然幢",
value: "zrz",
},
{
label: "户",
value: "h",
},
];
createFilter("bdcLxFilter", bdcLxArray);
\ No newline at end of file
......
<template>
<div class="">分割</div>
<div class="main">
<div class="button">
<el-button type="primary" @click="newAdd">新增</el-button>
</div>
<div class="table">
<table border="1">
<tr>
<td>序号</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
</tr>
<tr v-if="Object.keys(bgqData)==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else>
<!--<tr v-else v-for="(item,index) in bgqData" :key="index">-->
<td>1</td>
<td><input type="text" class="formInput" v-model="bgqData.zddm" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="bgqData.bdcdyh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="bgqData.xmmc" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="bgqData.bdcqzh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="bgqData.qlr" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="bgqData.zl" readonly="readonly"/></td>
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" @close="closepop"></query-data>
</div>
</template>
<script>
export default {
name:"",
components:{},
props:{},
data(){
return {
import QueryData from './../../../../components/queryData/queryData'
export default {
name: "",
components: {QueryData},
props: {},
data() {
return {
centerDialogVisible: false,
bgqData: {}
}
},
created() {
},
mounted() {
},
methods: {
closepop: function () {
this.centerDialogVisible = false;
},
newAdd: function () {
this.centerDialogVisible = true;
},
addData: function (val) {
this.centerDialogVisible = false;
this.bgqData = val
},
getData: function (data) {
this.bgqData = data
},
},
computed: {},
watch: {},
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<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%;
.formInput {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.noData {
color: #b2b2b2;
}
}
</style>
......
<template>
<div class="">合并</div>
<div class="main">
<div class="header">
<span>合并后项目名称:</span>
<el-input></el-input>
<el-button type="primary" @click="newAdd">新增</el-button>
<el-button type="primary">保存</el-button>
</div>
<table border="1">
<tr>
<td>序号</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
</tr>
<tr v-if="bgqData.length==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in bgqData" :key="index">
<td>{{index+1}}</td>
<td><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
</tr>
</table>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" @close="closepop"></query-data>
</div>
</template>
<script>
export default {
name:"",
components:{},
props:{},
data(){
return {
import {getSearchList} from './../../../../api/search'
import QueryData from './../../../../components/queryData/queryData'
export default {
name: "",
components: {QueryData},
props: {},
data() {
return {
centerDialogVisible: false,
bgqData: []
}
},
created() {
},
mounted() {
},
methods: {
newAdd: function () {
this.centerDialogVisible = true;
},
addData: function (val) {
this.centerDialogVisible = false;
this.bgqData.push(val)
},
getData: function (data) {
this.bgqData.push(data)
},
},
computed: {},
watch: {},
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
.header {
display: flex;
justify-items: left;
span {
width: 130px;
line-height: 40px;
}
.el-input {
width: 200px;
margin-right: 20px;
}
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
.formInput {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.noData {
color: #b2b2b2;
}
}
</style>
......
......@@ -21,7 +21,7 @@
<td colspan="2" align="center" >不动产单元号</td>
<!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
<td colspan="4" >
<el-input v-model="form.dyhbsm" style="width: 70%"></el-input>
<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
<el-button @click.prevent="" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
......@@ -33,11 +33,11 @@
<tr height="30">
<td colspan="2" align="center" >逻辑幢号</td>
<td colspan="4" >
<el-input v-model="form.ljzbsm"></el-input>
<el-input v-model="form.ljzh"></el-input>
</td>
<td colspan="2" align="center" >层号</td>
<td colspan="4" >
<el-input v-model="form.cbsm"></el-input>
<el-input v-model="form.ch"></el-input>
</td>
</tr>
......@@ -387,10 +387,12 @@
form:{
zrzbsm:'', //自然幢标识码
ljzbsm:'', //逻辑幢标识码
ljzh:'', //逻辑幢号
zdybsm:'', //幢单元标识码
cbsm:'', //层标识码
ch:'', //层号
zdbsm:'', //宗地标识码
dyhbsm:'', //不动产单元号标识码
bdcdyh:'', //不动产单元号标识码
ydybsm:'', //原单元标识码
zrzh:'', //自然幢号
mjdwbsm:'', //面积单位编号
......@@ -423,7 +425,6 @@
ftxs:'', //分摊系数
scyclx:'', //实预测类型(0:预测,1:实测;),区别户是实测还是预测数据
scycglbsm:'', //实测预测关联标识码
ch:'', //层号
bz:'', //备注
name:'',
date:'',
......
......@@ -182,7 +182,6 @@
},
save() {
jzdsingleModify(this.jzdlist).then(res => {
console.log(res)
if (res.success) {
Message.success("保存成功")
this.getData(this.bsm)
......
......@@ -247,9 +247,7 @@
})
},
save() {
console.log("保存....");
jzxsingleModify(this.jzxlist).then(res => {
console.log(res)
if (res.success) {
Message.success("保存成功")
this.getData(this.bsm)
......
......@@ -89,7 +89,6 @@
})
},
save() {
console.log(this.mjftData);
for (let val of this.mjftData.list) {
if (val.dzwdm == '') {
Message.error("定着物代码不能为空")
......@@ -98,7 +97,6 @@
}
this.mjftData['zdbsm'] = this.$store.state.zdbsm
savemjft(this.mjftData).then(res => {
console.log(res)
if (res.success) {
Message.success("保存成功")
this.getData(this.mjftData.zdbsm)
......@@ -180,8 +178,12 @@
},
mounted() {
console.log("mounted init...")
this.mjftData.zdbsm=this.$store.state.zdbsm
this.zdmj=this.$store.state.zdmj
this.tdzl=this.$store.state.zdzl
this.zddm=this.$store.state.zddm
if (this.mjftData.zdbsm) {
this.getData()
this.getData(this.mjftData.zdbsm)
}
},
watch: {
......
......@@ -17,9 +17,9 @@
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >逻辑幢顺序号</td>
<td colspan="2" align="center" >逻辑幢名称</td>
<td colspan="4" >
<el-input v-model="form.ljzsxh"></el-input>
<el-input v-model="form.ljzmc"></el-input>
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="4" >
......@@ -38,6 +38,7 @@
<el-date-picker
v-model="form.jgrq"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</td>
......@@ -86,7 +87,7 @@
<span @click="deleteYtInfo(index)">删除</span>
</td>
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.tdytList"
:key="item.bsm"
......@@ -161,6 +162,7 @@
<script>
import {insertLjzInfo} from "../../../api/zrz";
import {formdate} from "../../../libs/function";
export default {
name:'ljz',
components:{},
......@@ -170,7 +172,7 @@
zrzbsm:'',
ljzh:'', //逻辑幢号
zrzh:'', //自然幢号
ljzsxh:'', //逻辑幢顺序号
ljzmc:'', //逻辑幢顺序号
bdcdyh:'', //不动产单元号
mph:'', //门牌号
jgrq:'', //竣工日期
......@@ -228,6 +230,38 @@
});
this.fwjgTitleRowspan=this.form.fwjgList.length;
},
//重置数据
reset(){
this.form = {
zrzbsm:'',
ljzh:'', //逻辑幢号
zrzh:'', //自然幢号
ljzmc:'', //逻辑幢顺序号
bdcdyh:'', //不动产单元号
mph:'', //门牌号
jgrq:'', //竣工日期
ycjzmj:'', //预测建筑面积
scjzmj:'', //实测建筑面积
ycdxmj:'', //预测地下面积
scdxmj:'', //实测地下面积
ycqtmj:'', //预测其他面积
scqymj:'', //实测其他面积
ytList:[{
glbsm:'', //关联标识码
fwytzdbsm:'', //房屋用途字典标识码
sx:'', //顺序
}],
fwjgList:[{
fwjgzdbsm:'', //房屋结构字典标识码
glbsm:'', //关联标识码
sx:'', //顺序
}],
dxcs:'', //地下层数
dscs:'', //地上层数
zcs:'', //总层数
jzwzt:'', //建筑物状态
}
},
deleteFwjgInfo(index){
if(this.form.fwjgList.length<=1){
this.$message({
......@@ -242,9 +276,14 @@
onSave(data,bsm){
//自然幢标识码
this.form.zrzbsm= bsm;
insertLjzInfo(data).then((res)=>{
insertLjzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存成功")
//更新树结构数据
console.log(this);
this.$parent.$parent.getLpbMenuTree(bsm);
//关闭弹框
this.$parent.$parent.closeDaialog()
}
})
},
......@@ -289,7 +328,7 @@
td{
//bgcolor:#F1F4FC;
bgcolor:#fff;
background-color:#fff;
width:8.33%
}
......
......@@ -28,7 +28,7 @@
<td><input type="number" class="formInput" v-model.number="item.jgzmj" @keydown="oninput"/></td>
<td><input type="number" class="formInput" v-model.number="item.zdmj" @keydown="oninput"/></td>
<td><input type="number" class="formInput" v-model.number="item.fttdmj" @keydown="oninput"/></td>
<td><input type="text" class="formInput" v-model="item.fj" @keydown="oninput"/></td>
<td><input type="text" class="formInput" v-model="item.fj"/></td>
</tr>
<!-- <tr>
<td>统计</td>
......@@ -88,6 +88,7 @@
console.log(res)
if (res.success) {
Message.success("新增成功")
this.getData(this.$store.state.zrzbsm)
} else {
Message.error(res.message)
}
......