Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4313cbea by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/zrz/lpb/bjlp/ljz/index.vue
2 parents aa4b2372 f0bcb4de
Inline Side-by-side
Showing 9 changed files with 104 additions and 56 deletions
import request from '@/plugin/axios'
/**
* 查询幢单元基本信息
*/
export function getQjZdyDetailById(data) {
return request({
url: '/system/qjZdy/getQjZdyDetailById',
method: 'get',
params: {
id: data,
}
})
}
/**
* 更新保存幢单元基本信息
*/
export function updateQjZdy(data) {
return request({
url: '/system/qjZdy/updateQjZdy',
method: 'put',
data: data,
})
}
......@@ -329,12 +329,14 @@
type: String,
default: "15vh",
},
'bsm':String
bsm: {
type: String,
default: "",
},
},
data() {
return {
update:false,
// bsm:'',
gyfs: '',
tableData: [],
gyfsList:[],
......@@ -499,7 +501,7 @@
updateQlrDlrFr(this.formData).then((res)=>{
if(res.code===200){
this.$message.success("修改完成！");
this.getQlrInfo();
this.getQlrInfo(this.bsm);
this.update=false;
this.dialogVisible = false;
}
......@@ -510,7 +512,7 @@
this.tableData.push(this.formData);
Object.assign(this.$data, this.$options.data())
this.dialogVisible = false;
this.getQlrInfo();
this.getQlrInfo(this.bsm);
}
})
}
......@@ -572,7 +574,7 @@
deleteQlrDlrFrByQlrbsm(qlrbsms).then((res)=>{
if(res.code===200){
this.$message.success("删除完成！")
this.getQlrInfo();
this.getQlrInfo(this.bsm);
}
})
} else {
......@@ -614,8 +616,8 @@
});
}
},
getQlrInfo(){
getQlrInfoByGlbsm(this.bsm).then((res)=>{
getQlrInfo(bsm){
getQlrInfoByGlbsm(bsm).then((res)=>{
if(res.code){
if(res.result!=null){
this.tableData=res.result;
......@@ -633,7 +635,7 @@
this.gyfsList = this.$store.state.gyfsList;
},
mounted() {
this.getQlrInfo();
this.getQlrInfo(this.bsm);
if(this.$store.state.gyfsList.length>0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}
......@@ -711,7 +713,6 @@
this.$refs.zjzlbsm.$el.style.border = '';
}
},
// "formData.gyfsbsm":function (val) {
// let ddsy = '';
// for(let i = 0;i<this.gyfsList.length;i++){
......
......@@ -263,7 +263,7 @@ export default {
zddm: "",
zl: "",
pageNo: 1,
pageSize: 12,
pageSize: 15,
type:'add',
},
Data: [],
......@@ -369,7 +369,7 @@ export default {
zddm: "",
zl: "",
pageNo: 1,
pageSize: 12
pageSize: 15
};
this.getData(this.queryData);
},
......
......@@ -380,6 +380,7 @@
getQjZdjbxxDetailById,
updateQjZdjbxx,
} from "@api/zd";
import { Message } from 'element-ui';
export default {
inject: ['getRightTree'],
......@@ -753,48 +754,52 @@
type: "warning",
});
} else {
updateQjZdjbxx(this.formData)
.then((res) => {
if (res.code == 200) {
console.log(res);
if (this.$refs.qlrxxModule.getQlgyfsData() == 'PSHGSBDCQJDC000000000000DC340020' && this.$refs.qlrxxModule.getQlrxxData().length < 2 ) {
Message.error('当前权利人共有方式至少需要添加两名权利人')
}else{
updateQjZdjbxx(this.formData)
.then((res) => {
if (res.code == 200) {
console.log(res);
this.$message({
message: '保存成功',
type: "success",
});
// 保存成功再次查询
this.getZdjbxxData(this.$store.state.zdbsm);
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
.catch((error) => {
this.$message({
message: '保存成功',
type: "success",
message: error.message+"，查看日志，联系管理员",
type: "error",
});
// 保存成功再次查询
this.getZdjbxxData(this.$store.state.zdbsm);
});
//保存到空间库里面
var self = this;
for (var key in this.geoAttributes) {
if (key == "BSM") {
self.geoAttributes[key] = this.$store.state.zdbsm
} else if (key == 'QLSDFS') {
var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
var qlsdfs = qlsdfsList.filter(item => {
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
} else {
this.$message({
message: res.message,
type: "warning",
});
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
})
.catch((error) => {
this.$message({
message: error.message+"，查看日志，联系管理员",
type: "error",
});
});
//保存到空间库里面
var self = this;
for (var key in this.geoAttributes) {
if (key == "BSM") {
self.geoAttributes[key] = this.$store.state.zdbsm
} else if (key == 'QLSDFS') {
var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
var qlsdfs = qlsdfsList.filter(item => {
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
} else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
console.log("属性保存完成!!");
});
}
self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
console.log("属性保存完成!!");
});
}
} else {
this.$message({
......@@ -922,7 +927,8 @@
this.$store.state.zddm = val;
},
zdbsm: function (val) {
this.getZdjbxxData(val)
this.getZdjbxxData(val);
this.$refs.qlrxxModule.getQlrInfo(val);
this.curZdbsm = val;
},
"formData.bdcdyh": function (val) {
......
......@@ -157,8 +157,10 @@
watch:{
cbsm: {
handler: function (item) {
if(item!='' && this.$parent.menuType == 'c'){
this.getLjzInfo(this.item)
console.log(item,"item")
console.log(this.$parent.$parent.menuType,"this.$parent.$parent.menuType")
if(item!='' && this.$parent.$parent.menuType == 'c'){
this.getCinfo(item)
}
},
immediate: true
......
<template>
<div class="h content-form" ref="mainBox" :class="$route.path == '/h' ? 'hpage':''" :style="{'height': $route.path == '/h' ? '100%' : formHeight+'px'}">
<el-form ref="form" :model="form" label-width="160px" class="form">
<Qlr ref="qlrxxModule" :bsm='bsm'></Qlr>
<Qlr ref="qlrxxModule" :bsm='bsm' :qszt="form.qszt"></Qlr>
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
<tbody>
<tr height="30">
......@@ -21,7 +21,7 @@
<td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
<!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh" @blur="inputBlur($event)"></el-input>
<el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
......@@ -1014,7 +1014,7 @@
"form.bdcdyh":function (val) {
if (val != '') {
this.$refs.bdcdyh.style.border = '';
this.$refs.bdcdyh.$el.style.border = '';
}
},
......
......@@ -412,9 +412,11 @@ export default {
Message.warning("已提交的户无法继续操作")
}else{
batchCommit(this.bsms).then(res=>{
if (res.success) {
if(res.code === 200){
Message.success("提交成功");
this.getlpbData();
}else {
this.$message.error(res.message);
}
})
}
......
......@@ -680,7 +680,7 @@ export default {
break;
}
}
}, 100);
}, 200);
},
//户双击事件
dbclick(bsm) {
......
......@@ -46,6 +46,7 @@
<script>
import {insertZdyInfo} from "@api/lpb"
import {getQjZdyDetailById,updateQjZdy} from "@api/zdy"
export default {
name: "index",
components: {},
......@@ -113,10 +114,20 @@
});
}else{
//编辑幢单元接口
updateQjZdy(this.form).then((res)=>{
if(res.code === 200){
this.$message.success("保存成功")
}
})
}
},
getZdyInfo(bsm){
//查询幢单元信息接口
getQjZdyDetailById(bsm).then((res)=>{
if(res.code === 200){
this.form = res.result;
}
})
},
reset(){
......@@ -133,7 +144,7 @@
watch:{
zdybsm: {
handler: function (item) {
if(item!='' && this.$parent.menuType == 'zdy'){
if(item!='' && this.$parent.$parent.menuType == 'zdy'){
this.getZdyInfo(item)
}
},
......