Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
6306e097 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem into master 

 Conflicts:
	src/components/lineTree/lineTree.vue
	src/views/zd/zddcb/index.vue
2 parents f43aad33 8778a3e1
Inline Side-by-side
Showing 12 changed files with 173 additions and 93 deletions
......@@ -145,3 +145,26 @@ export function moveH(data) {
data:data
})
}
/**
* 删除逻辑幢
* @param bsm
*/
export function deleteLjz(id) {
return request({
url:'system/qjLjz/deleteLjzByBsm',
method:'delete',
params:{
id
}
})
}
export function deleteZdy(id) {
return request({
url:'system/qjZdy/deleteZdyByBsm',
method:'delete',
params:{
id
}
})
}
......
......@@ -137,6 +137,9 @@ ol, ul { list-style:none; }
-webkit-box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
}
.el-dialog__body{
padding-bottom: 25px!important;
}
// 自定义右键菜单样式
.contextmenu {
margin: 0;
......
......@@ -27,7 +27,7 @@
reTree_collapse_icon: item.expand && item.children.length > 0,
reTree_expand_icon: !item.expand && item.children.length > 0,
}"
></div>
></div>
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div>
</div>
......@@ -72,6 +72,7 @@
class="contextmenu"
>
<li @click="openCreateDialog">新建自然幢</li>
<li @click="deleteByBsm()">删除</li>
</ul>
<ul
v-show="createVisible"
......@@ -88,6 +89,8 @@
<li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li>
<li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li>
<li v-show="zdData.type == 'zrz' || zdData.type == 'ljz' || zdData.type == 'zdy'" @click="openLpbDialog('ch')">添加层户</li>
<li v-show="zdData.type == 'ljz'" @click="deleteLjz">删除逻辑幢</li>
<li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除幢单元</li>
</ul>
<el-dialog title="导入图形" :visible.sync="improtDialog">
......@@ -106,6 +109,7 @@ import Create from "../../views/panel/create/index";
import ImportGeo from './tx/importGeo'
import geoUtils from "@components/lineTree/tx/js/geoUtils";
import featureUpdate from "@libs/map/featureUpdate";
import {deleteLjz,deleteZdy} from "./../../api/lpb"
export default {
inheritAttrs: false,
props: {
......@@ -151,7 +155,7 @@ export default {
this.formatData = this.preDealData(n);
console.log(this.formatData);
},
lpbvisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
......@@ -166,7 +170,7 @@ export default {
document.body.removeEventListener("click", this.closeMenu);
}
},
// createVisible(value) {
// if (value) {
// document.body.addEventListener("click", this.closeMenu);
......@@ -182,6 +186,29 @@ export default {
},
methods: {
loading(){
this.$emit("loading")
},
deleteLjz(){
console.log("删除逻辑幢")
console.log(this.zdData,"zdData")
deleteLjz(this.zdData.bsm).then(res=>{
if (res.success) {
this.loading()
}else {
}
})
},
deleteZdy(){
console.log("删除幢单元")
console.log(this.zdData,"zdData")
deleteZdy(this.zdData.bsm).then(res=>{
if (res.success) {
this.loading()
}
})
},
// 改变菜单数据
changeVisible(data) {
this.visible = data;
......@@ -304,7 +331,7 @@ export default {
},
//楼盘表右键菜单项打开父组件弹框
openLpbDialog(type){
this.$parent.openLpbDialog(this.zdData,type);
this.$parent.openLpbDialog(this.zdData,type);
},
detailDoubleClick(data) {
clearTimeout(this.timer);
......@@ -476,7 +503,7 @@ export default {
flex-direction: column;
justify-content: flex-start;
align-items: center;
}
.row-flex-start {
display: flex;
......@@ -490,12 +517,6 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
}
// .active_color {
// color: #ffffff;
// }
.reTree_box {
// overflow-y: auto;
}
.reTree_icon {
width: 17px;
height: 17px;
......
......@@ -20,6 +20,7 @@
</el-form-item>
<el-form-item label="不动产单元号">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
@change="query"
......
......@@ -10,11 +10,11 @@
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="4" >
<input class="formInput" v-model="form.zddm">
<input class="formInput" maxlength="19" v-model="form.zddm">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" v-model="form.bdcdyh">
<input class="formInput percent80" maxlength="28" v-model="form.bdcdyh">
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
</tr>
......
......@@ -21,7 +21,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号">
<el-input
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
></el-input>
......
......@@ -117,16 +117,20 @@
//点击办理
handleClick(row) {
let type;name;
let path = "";
switch (row.dylx) {
case "zd":
type = "0";
name = '宗地';
this.$store.state.zdbsm = row.glbsm
path = "/zd";
break;
case "zrz":
type = "1";
name = '自然幢';
this.$store.state.zrzbsm = row.glbsm;
path = "/zrz";
break;
case "h":
case "h0":
......@@ -138,6 +142,7 @@
type = "3";
name = "多幢";
this.$store.state.dzbsm = row.glbsm;
path = "/dz";
default:
break;
}
......@@ -154,7 +159,13 @@
type: 'success',
message: '更正成功!'
});
this.$router.push("/"+path);
this.$router.push({
path: path,
query: {
bsm: res.result,
source: 2
}
});
} else {
this.$message({
message: res.message,
......
......@@ -46,7 +46,7 @@
</el-pagination>
</div>
<el-dialog title="户编辑" :visible.sync="hbjVisible" width="50%" center>
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
......@@ -219,5 +219,14 @@
padding: 18px 0;
}
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
.btnGroup{
margin: 20px auto 0;
width: 230px;
}
}
</style>
......
......@@ -107,7 +107,7 @@
</td>
<td colspan="2">宗地代码<i class="requisite">*</i></td>
<td colspan="4" class="psr">
<input :disabled="formData.qszt!='0'"
<input :disabled="formData.qszt!='0'" maxlength="19"
type="text" placeholder="请输入"
class="formInput percent80"
v-model="formData.zddm"
......@@ -126,7 +126,7 @@
<td colspan="2">不动产单元号<i class="requisite">*</i></td>
<td colspan="4" class="psr">
<input
type="text" :disabled="formData.qszt!='0'"
type="text" :disabled="formData.qszt!='0'" maxlength="28"
class="formInput percent80"
v-model="formData.bdcdyh"
/>
......@@ -454,7 +454,7 @@ export default {
})
}
//权利性质数据传给子组件
this.$refs.qlxzModule.countList = res.result.list
this.$refs.qlxzModule.countList = res.result.list;
}
}
})
......@@ -485,7 +485,6 @@ export default {
this.dpdm = this.dpdm + item.dm;
}
});
console.log(this.dpdm)
},
//不动产单元号再次生成提示框
......@@ -540,39 +539,45 @@ export default {
this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl;
this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd;
this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? this.jzxg : this.formData.jyjzxg;
//判断宗地代码和不动产单元号是否手动修改过（宗地代码和不动产单元号的前14位是否和底盘代码一致）
if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){
this.$message({
message: '宗地代码或不动产单元号有误，请核对后再试一次',
type: "warning",
});
}else{
// FIXME:表单验证错误
/* this.$refs['ruleForm'].validate((valid) => {
debugger
if (valid) {
alert('submit!');
} else {
alert("error submit")
return false;
}
});*/
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) => {});
}
// FIXME:表单验证错误
/* this.$refs['ruleForm'].validate((valid) => {
debugger
if (valid) {
alert('submit!');
} else {
alert("error submit")
return false;
}
});*/
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",
});
}
//保存空间库
//todo
})
.catch((error) => {});
},
//提交宗地基本信息
......@@ -631,14 +636,17 @@ export default {
this.$store.state.xzqList = res.result;
})
.catch((error) => {});
getListByXzqbsm(xzqdm)
.then((res) => {
this.$store.state.djqList = res.result;
})
.catch((error) => {});
getListByPbsm(djqdm)
.then((res) => {
this.$store.state.djzqList = res.result;
getListByXzqbsm(xzqdm)
.then((res) => {
this.$store.state.djqList = res.result;
//生成底盘代码
this.generatorDpdm();
})
.catch((error) => {});
})
.catch((error) => {});
}
......
......@@ -8,6 +8,7 @@
<el-radio-button label="0">预测</el-radio-button>
</el-radio-group>
<el-input
maxlength="28"
v-model="bdcdyh"
:style="{ width: inputWidth + 'px' }"
@focus="inputFocus"
......@@ -79,7 +80,7 @@
>
<!-- 左侧树结构 -->
<div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
<LineTree :pd="pd" class="treeData" :islpb="islpb"></LineTree>
<LineTree :pd="pd" class="treeData" :islpb="islpb" @loading="loading"></LineTree>
<p
@click="createFlag = false"
style="width:20px;float:left;margin-top: 12px;margin-left:10px;cursor:pointer;"
......@@ -246,7 +247,7 @@
@close="hcxlzClose"
></h-cxlz>
<!-- 双击户的弹出框 -->
<el-dialog title="户编辑" :visible.sync="hbjVisible" width="50%" center>
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<hbj ref="hbj" :bsm="hbsm"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
......@@ -393,6 +394,9 @@ export default {
}, 100);
},
methods: {
loading(){
this.getLpbMenuTree(this.$store.state.zrzbsm);
},
openPlC(){
if (this.cbsmList.length <= 0) {
Message.warning("请选择层")
......@@ -848,5 +852,10 @@ export default {
margin: 20px auto 0;
width: 230px;
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
}
</style>
......
......@@ -21,7 +21,7 @@
</td>
<td colspan="2" align="center">自然幢号</td>
<td colspan="4">
<el-input v-model="form.zrzh"></el-input>
<el-input v-model="form.zrzh" maxlength="24"></el-input>
</td>
</tr>
<tr height="30">
......@@ -31,7 +31,7 @@
</td>
<td colspan="2" align="center">不动产单元号</td>
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80"></el-input>
<el-input v-model="form.bdcdyh" maxlength="28" class="percent80"></el-input>
<el-button
@click.prevent=""
size="mini"
......
......@@ -10,11 +10,11 @@
<td colspan="2">宗地代码</td>
<td colspan="4" style="min-width:450px">
<input v-model="form.zddm" class="formInput" disabled>
<input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
<input v-show="false" :disabled="form.qszt!='0'" maxlength="19" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" >自然幢号<i class="requisite">*</i></td>
<td colspan="4" class="psr">
<input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh">
<input class="formInput percent80" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
......@@ -25,7 +25,7 @@
</td>
<td colspan="2" >不动产单元号<i class="requisite">*</i></td>
<td colspan="4">
<input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh">
<input class="formInput " :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh">
</td>
</tr>
......@@ -348,22 +348,6 @@
sx:'', //顺序
}],
},
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
......@@ -412,23 +396,33 @@
}
},
onSave(){
this.loading=true;
this.form.zrzbsm=this.bsm;
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
if(1>0){
saveZrzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存完成！")
}else {
this.$message({
message: res.message,
type: "warning",
});
}
//判断自然幢号和不动产单元号是否手动修改过（自然幢号和不动产单元号的前19位是否和宗地代码一致）
console.log(this.form,'this.form');
if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){
this.$message({
message: '自然幢号或不动产单元号有误，请核对后再试一次',
type: "warning",
});
}else{
this.loading=true;
this.form.zrzbsm=this.bsm;
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
if(1>0){
saveZrzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存完成！")
}else {
this.$message({
message: res.message,
type: "warning",
});
}
this.loading=false;
})
this.loading=false;
})
this.loading=false;
}
}
},
onSubmit(){
let data={
......