Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
2c8a791c by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 08f5ecde 89a48c0c
Inline Side-by-side
Showing 5 changed files with 139 additions and 117 deletions
......@@ -8,7 +8,6 @@
:modal-append-to-body="false"
>
<div>
<span class="xl" @click="xl">祥例</span>
<table border="1">
<tr>
<td>室号前缀</td>
......@@ -57,14 +56,6 @@
<div class="gz">
<span>室号规则：{{gz}}</span>
</div>
</div>
<div>
<el-dialog
title="祥例"
:visible.sync="xlVisible"
width="50%"
:modal-append-to-body="false"
>
<div class="xlgz">
<span>
样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
......@@ -80,7 +71,6 @@
样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”)
</span>
</div>
</el-dialog>
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
......@@ -109,7 +99,6 @@
data() {
return {
isVisible: false,
xlVisible: false,
plshData: {
shqz: '',
selectDyh: false,
......@@ -153,9 +142,6 @@
lodding: function () {
this.$emit('lodding')
},
xl: function () {
this.xlVisible = true;
},
close: function () {
this.$emit("close")
this.isVisible = false
......@@ -204,9 +190,9 @@
if (this.plshData.fgfA !== "") {
gz += this.plshData.fgfA
}
if (this.plshData.c === 1) {
if (+this.plshData.c === 1) {
gz += "[名义层]"
} else if (this.plshData.c === 2) {
} else if (+this.plshData.c === 2) {
gz += "[实际层]"
}
if (this.plshData.fgfB !== "") {
......@@ -267,7 +253,7 @@
.gz {
color: #b2b2b2;
font-size: 12px;
font-size: 14px;
margin-top: 40px;
}
......
......@@ -262,36 +262,35 @@
if (this.plzlData.qz !== '') {
gz += this.plzlData.qz
}
if (this.plzlData.zd === 1) {
if (+this.plzlData.zd === 1) {
gz += "[宗地坐落]";
} else if (this.plzlData.zd === 2) {
} else if (+this.plzlData.zd === 2) {
gz += "[宗地名称]";
}
if (this.plzlData.zrz === 1) {
if (+this.plzlData.zrz === 1) {
gz += "[自然幢坐落]"
} else if (this.plzlData.zrz === 2) {
} else if (+this.plzlData.zrz === 2) {
gz += "[自然幢名称]";
}
if (this.plzlData.ljz === 1) {
if (+this.plzlData.ljz === 1) {
gz += "[逻辑幢名称]"
} else if (this.plzlData.ljz === 2) {
} else if (+this.plzlData.ljz === 2) {
gz += "[逻辑幢号]"
}
if (this.plzlData.zdy === 1) {
if (+this.plzlData.zdy === 1) {
gz += "[幢单元名称]";
} else if (this.plzlData.zdy === 2) {
} else if (+this.plzlData.zdy === 2) {
gz += "[幢单元号]"
}
if (this.plzlData.c === 1) {
if (+this.plzlData.c === 1) {
gz += "[名义层]"
} else if (this.plzlData.c === 2) {
} else if (+this.plzlData.c === 2) {
gz += "[实际层]"
}
if (this.plzlData.h === 1) {
if (+this.plzlData.h === 1) {
gz += "[室号]"
} else if (this.plzlData.h === 2) {
} else if (+this.plzlData.h === 2) {
gz += "[户号]"
}
if (this.plzlData.hz !== "") {
......
......@@ -6,6 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
:close-on-click-modal="false"
>
<div class="search">
<el-row>
......@@ -64,6 +65,7 @@
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<td>自然幢数量</td>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
......@@ -81,6 +83,7 @@
<td>{{item.bdcqzh}}</td>
<td>{{item.qlr}}</td>
<td>{{item.zl}}</td>
<td>{{item.zrzCount}}</td>
</tr>
</table>
</div>
......@@ -167,8 +170,14 @@
this.getData(this.queryData)
},
addData: function (val) {
this.$emit("getData", val)
if (this.isZdClose) {
let flag;
this.$emit("getData",
val
, i => {
flag = i
})
console.log(flag,"返回值")
if (flag&&this.isZdClose) {
this.close();
}
},
......@@ -234,9 +243,11 @@
.noData {
color: #b2b2b2;
}
.table-bode{
.table-bode {
height: 450px;
}
.page {
margin-top: 20px;
}
......
......@@ -237,7 +237,7 @@
<th class="xmmc" width="300px">项目名称</th>
<th class="xmmc">幢信息</th>
</tr>
<tr v-for="(item,index) in dzFghData.fwlist" :key="index*Math.random()">
<tr v-for="(item,index) in dzFghData.fwlist" :key="index">
<td class="cz">
<el-button
type="primary"
......@@ -258,7 +258,7 @@
</el-select>
</td>
<td class="xmmc">
<input type="text" v-model="item.xmmc" class="formInput"/>
<el-input v-model="item.xmmc" ></el-input>
</td>
<td class="zxx">
<div class="fghzxx">
......@@ -767,10 +767,10 @@
case 'dz':
this.dzFghData.fwlist.push(
{
"xmmc": "",
"zrzlist": [],
"zrzmclist": [],
"ztype": "zrz"
xmmc: "",
zrzlist: [],
zrzmclist: [],
ztype: "zrz"
}
);
this.dzFghData.olddzbsm = this.dzFgqData.bsm;
......
......@@ -137,7 +137,8 @@
<el-card class="zrz">
<div slot="header" class="clearfix">
<span style="margin-right:10px">幢信息</span>
<span style="margin-right:10px"><i class="iconfont iconduochuang"></i>多幢<span style="color:red">{{zdDzList.length}}</span>幢</span>
<span style="margin-right:10px"><i class="iconfont iconduochuang"></i>多幢<span
style="color:red">{{zdDzList.length}}</span>幢</span>
<span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{zdZrzList.length}}</span>幢</span>
</div>
<ul>
......@@ -153,7 +154,8 @@
</el-card>
</div>
</div>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
:isZdClose="true"
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
......@@ -230,7 +232,8 @@
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" :isZdClose="true"
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
:isZdClose="true"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button>
......@@ -257,14 +260,14 @@
getDdicByMC
} from "@api/common";
import {ZdHb} from "@api/zd"
import {saveDzHb,ZdfggetZxx} from "@api/dz"
import {saveDzHb, ZdfggetZxx} from "@api/dz"
import QueryData from '@components/queryData/queryData'
import zdQueryData from '@components/zdQueryData/zdQueryData'
import hfghb from '../hfghb/index'
export default {
name: "",
components: {QueryData,zdQueryData,hfghb},
components: {QueryData, zdQueryData, hfghb},
props: {},
data() {
return {
......@@ -275,7 +278,7 @@
zdhbhData: {}, // 宗地合并后数据
dzhbhData: [
{
xmmc:''
xmmc: ''
}
], // 多幢合并后数据
hhbhData: {}, // 户合并后数据
......@@ -297,9 +300,9 @@
value: "Z",
}
],
hhbtabs:false,
zdDzList:[],
zdZrzList:[],
hhbtabs: false,
zdDzList: [],
zdZrzList: [],
}
},
created() {
......@@ -312,11 +315,11 @@
},
methods: {
handleClick(tab, event) {
if (tab.name == 'h') {
if (tab.name === 'h') {
this.hhbtabs = true
}
},
save(){
save() {
switch (this.tabName) {
case "zd":
this.zdHb();
......@@ -329,11 +332,11 @@
break
}
},
zdHb(){
let oldBsm= this.zdhbqData.map(function (item,index) {
zdHb() {
let oldBsm = this.zdhbqData.map(function (item, index) {
return item.zdbsm;
}).join(",")
let data={
let data = {
newzddjqbsm: this.zdhbhData.djqbsm,
newzddjzqbsm: this.zdhbhData.djzqbsm,
newzdsyqlxbsm: this.zdhbhData.syqlxbsm,
......@@ -343,8 +346,8 @@
newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
oldzdbsms: oldBsm
}
console.log(data,'宗地合并数据')
ZdHb(data).then(res=>{
console.log(data, '宗地合并数据')
ZdHb(data).then(res => {
if (res.success) {
this.$message.success("合并成功")
this.$router.push({
......@@ -354,29 +357,29 @@
source: 2
}
});
}else {
} else {
this.$message.error("合并失败")
}
})
},
dzHb(){
dzHb() {
},
hHb(){
hHb() {
},
deleteData(item,index){
deleteData(item, index) {
switch (this.tabName) {
case "zd":
this.zdhbqData.splice(index,1);
this.zdhbqData.splice(index, 1);
//删除幢信息中的数据
console.log(item);
console.log(this.zdZrzList,'this.zdZrzList');
this.zdZrzList = this.zdZrzList.filter(i => i.zdbsm!== item.zdbsm);
this.zdDzList = this.zdDzList.filter(i => i.zdbsm!== item.zdbsm);
console.log(this.zdZrzList, 'this.zdZrzList');
this.zdZrzList = this.zdZrzList.filter(i => i.zdbsm !== item.zdbsm);
this.zdDzList = this.zdDzList.filter(i => i.zdbsm !== item.zdbsm);
break
case "dz":
this.dzhbqData.splice(index,1)
this.dzhbqData.splice(index, 1)
break
default:
break
......@@ -448,40 +451,58 @@
newAdd: function () {
this.centerDialogVisible = true;
},
getData: function (data) {
let arr=[];
switch (this.tabName) {
case "zd":
arr=this.zdhbqData.filter(i=>i.zdbsm==data.zdbsm);
if (arr.length>0) {
break
}
addZdData(data) {
this.zdhbqData.push(data);
ZdfggetZxx(data.zdbsm).then(res => {
if (res.success) {
console.log(res.result,'res.result');
res.result.zrzList.forEach(item=>{
res.result.zrzList.forEach(item => {
item.zdbsm = data.zdbsm
})
res.result.dzList.forEach(item=>{
res.result.dzList.forEach(item => {
item.zdbsm = data.zdbsm
})
if(this.zdZrzList.length == 0){
if (this.zdZrzList.length === 0) {
this.zdZrzList = res.result.zrzList
}else{
} else {
this.zdZrzList = this.zdZrzList.concat(res.result.zrzList)
}
if(this.zdDzList.length == 0){
if (this.zdDzList.length === 0) {
this.zdDzList = res.result.dzList
}else{
} else {
this.zdDzList = this.zdDzList.concat(res.result.dzList)
}
}
})
},
async getData(data, callback) {
console.log(data, '选择宗地数据')
let flat = true;
switch (this.tabName) {
case "zd":
let arr = [];
arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
if (arr.length > 0) {
this.$message.info("当前宗地已选择,请重新选择")
callback(false)
break
}
arr = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm);
if (arr.length > 0) {
this.$confirm('当前宗地不在同一地籍子区下,请确认？')
.then(_ => {
this.addZdData(data)
})
.catch(_ => {
flat = false;
});
callback(flat)
} else {
this.addZdData(data)
}
break
case "dz":
arr=this.dzhbqData.filter(i=>i.glbsm==data.glbsm);
if (arr.length>0) {
arr = this.dzhbqData.filter(i => i.glbsm === data.glbsm);
if (arr.length > 0) {
break
}
if (this.dzhbqData.includes(data)) {
......@@ -494,20 +515,20 @@
}
},
//多幢合并保存
dzhbSave(){
console.log(this.dzhbqData,'dzhbqData');
dzhbSave() {
console.log(this.dzhbqData, 'dzhbqData');
let params = {
fwlist:[],
newdzxmmc:this.dzhbhData[0].xmmc,
zdbsm:''
fwlist: [],
newdzxmmc: this.dzhbhData[0].xmmc,
zdbsm: ''
}
this.dzhbqData.forEach(item=>{
this.dzhbqData.forEach(item => {
params.fwlist.push({
zbsm:item.bsm,
ztype:item.dylx
zbsm: item.bsm,
ztype: item.dylx
})
})
this.$nextTick(()=>{
this.$nextTick(() => {
console.log(params);
//TODO 调用保存接口
// saveDzHb(params).then((res) => {
......@@ -568,9 +589,11 @@
}
}
}
.psn{
position: unset!important;
.psn {
position: unset !important;
}
.hb-tabs {
height: auto;
width: 100%;
......@@ -666,13 +689,13 @@
margin-left: 20px;
}
.hbq {
margin:14px 20px 20px 20px;
margin: 14px 20px 20px 20px;
}
.dzhbh{
box-sizing: border-box!important;
padding: 0 18px 0 0!important;
margin-top: 10px!important;
display: block!important;
.dzhbh {
box-sizing: border-box !important;
padding: 0 18px 0 0 !important;
margin-top: 10px !important;
display: block !important;
}
.hbh {
margin-left: 20px;
......@@ -681,7 +704,7 @@
display: flex;
flex-direction: column;
flex-flow: nowrap;
.data{
.data {
width: 40%;
float: left;
}
......@@ -689,27 +712,27 @@
border: 1px solid #E6E6E6;
background-color: white;
overflow: auto;
.clearfix{
span{
.clearfix {
span {
color: #9B9B9B;
}
}
/deep/ .el-card__body{
padding:10px 12px;
/deep/ .el-card__body {
padding: 10px 12px;
}
ul {
li {
padding: 5px;
line-height: 20px;
color: #4A4A4A;
.label{
.label {
vertical-align: middle;
color: #4A4A4A;
display: inline-block;
width: 104px;
text-align: right;
}
.value{
.value {
vertical-align: middle;
color: #6D7278;
display: inline-block;
......@@ -718,17 +741,17 @@
word-break: break-all;
}
}
.hasChoosed{
.hasChoosed {
color: #BBB;
}
}
.zdjbxx{
.zdjbxx {
width: 100%;
height: 320px;
margin-bottom: 10px;
float: left;
}
.zdmap{
.zdmap {
width: calc(100% - 380px);
height: 200px;
float: left;
......@@ -746,12 +769,12 @@
text-align: center;
padding: 5px 0;
}
/deep/ .el-card__body{
/deep/ .el-card__body {
height: 200px;
overflow-y: scroll;
position: relative;
}
.line{
.line {
width: 1px;
height: calc(100% - 20px);
background-color: #EDEDED;
......@@ -762,8 +785,8 @@
.dz {
width: 33%;
overflow: auto;
ul{
li{
ul {
li {
width: 96% !important;
}
}
......@@ -784,12 +807,12 @@
text-align: left;
line-height: 20px;
display: inline-block;
.label{
.label {
width: 90px;
}
}
li:nth-of-type(even){
.label{
li:nth-of-type(even) {
.label {
width: 110px;
text-indent: 20px;
}
......@@ -798,13 +821,16 @@
}
}
}
.cz{
.cz {
color: blue;
}
.cz:hover{
.cz:hover {
color: blue;
text-decoration: underline;
}
/deep/ .el-select {
width: 100%;
}
......