Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
1b0d010a by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents ac695d2a 0a3a38d6
Expand all
Inline Side-by-side
Showing 10 changed files with 133 additions and 93 deletions
......@@ -70,6 +70,11 @@ const constantRoutes = [
name: "宗地",
code: "1-5",
component: () => import("@/views/zd/index"),
},{
path: "/h",
name: "户",
code: "1-6",
component: () => import("@/views/systemH/index"),
},
{
path: "/viewMap",
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import dzxx from "./dzxx";
import fjcl from "./../zd/fjcl/fjcl"
export default {
name: "",
components: {
dzxx
dzxx,fjcl
},
props: {},
data() {
return {
activeName: "dzxx",
dzJbxxVisble:false,
fjclVisible:false
};
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
switch (tab.name) {
case 'dzxx':
this.dzJbxxVisble = true;
break
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
created() {},
......
......@@ -127,7 +127,7 @@
this.$store.state.zdbsm = row.glbsm
break;
case "h":
path = "h";
path = "/h";
this.$store.state.hbsm = row.glbsm
type = "2";
default:
......
......@@ -38,11 +38,6 @@
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
</el-tooltip>
<!-- <el-button type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button> -->
</template>
</el-table-column>
</el-table>
......@@ -52,15 +47,6 @@
</el-pagination>
</div>
<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>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
......@@ -68,11 +54,10 @@
<script>
import SearchHead from "../../../components/searchHead/searchHead";
import {getSearchList} from "../../../api/search";
import hbj from "./../../zrz/lpb/bjlp/hbj/index";
export default {
name: "",
components: {SearchHead,hbj},
components: {SearchHead},
props: {},
data() {
return {
......@@ -82,9 +67,6 @@
tableData: [],
tableHeight: 0,
queryData: {},
hbjVisible: false,
hbsm:'',
tabPosition: "1", //1是实测 0是预测
};
},
created() {
......@@ -106,20 +88,6 @@
return "";
}
},
//户保存
hbjSaveInfo() {
this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户提交
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
},
handleCurrentChange(val) {
this.pageNo = val;
this.queryData.pageNo = val;
......@@ -159,17 +127,8 @@
case "h":
case "h0":
case "h1":
this.hbsm = row.glbsm;
this.hbjVisible = true;
if(row.dylx === "h0"){
this.tabPosition = 0;
}else {
this.tabPosition = 1;
}
this.$nextTick(()=>{
console.log(this.$refs.hbj);
this.$refs.hbj.getHInfo(this.hbsm);
});
path="/h";
this.$store.state.hbsm=row.glbsm
break;
default:
break;
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="户基本信息表" name="hjbxx">
<hbj :bsm="hbsm"></hbj>
</el-tab-pane>
<el-tab-pane label="登记簿" name="djb">
<djb v-if="djbVisible"></djb>
</el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible"></fjcl>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import hbj from "./../zrz/lpb/bjlp/hbj/index"
import djb from "./../zd/djb/index";
import fjcl from "./../zd/fjcl/fjcl"
export default {
name: "index",
components: {
hbj, djb, fjcl
},
data() {
return {
hbsm:this.$store.state.hbsm,
activeName: "hjbxx",
djbVisible: false,
fjclVisible: false,
}
},
mounted() {
},
methods: {
handleClick(tab, event) {
// console.log(tab, event);
switch (tab.name) {
case 'djb':
this.djbVisible = true;
break;
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
watch: {}
}
</script>
<style scoped>
</style>
......@@ -106,6 +106,7 @@
window.open(`/api/file/download?url=`+url);
},
getFileList() {
console.log(this.$route.name,'NAME')
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
......@@ -115,6 +116,14 @@
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
break
case "多幢":
this.filesData.dylx = 'dz';
this.filesData.glbsm = this.$store.state.dzbsm
break
case "户":
this.filesData.dylx = 'h';
this.filesData.glbsm = this.$store.state.hbsm
break;
default:
break
}
......
......@@ -391,6 +391,11 @@
</tbody>
</table>
</el-form>
<div class="btnGroup">
<el-button type="primary" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
<!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
......@@ -404,7 +409,7 @@
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz";
import {submit} from "./../../../../../api/common"
import {submit,registerCall} from "./../../../../../api/common"
export default {
name:'zrz',
components:{
......@@ -520,7 +525,24 @@
fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
}
},
created(){
let bsm=this.$store.state.hbsm
console.log(bsm,'户BSM')
this.getHInfo(bsm);
},
methods: {
registerCall(){
let data={
type:'h',
bsm:this.$store.state.hbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......@@ -675,10 +697,8 @@
})
},
//保存户信息
onSave(bsm,yclx){
console.log(bsm);
console.log(yclx)
this.form.bsm=bsm;
onSave(){
this.form.bsm=this.$store.state.hbsm;
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
if(this.form.scyclx==='0'){
this.form.jzmj = this.form.ycjzmj;
......@@ -703,9 +723,9 @@
}
})
},
onSubmit(bsm,yclx){
onSubmit(){
let data={
glbsm:bsm,
glbsm:this.$store.state.hbsm,
status:1,
type:"h"
}
......@@ -818,7 +838,7 @@
watch: {
scyclx:{
handler(n){
this.$nextTick(()=>{
this.$nextTick(()=>{
this.form.scyclx = this.scyclx;
})
}
......@@ -828,7 +848,7 @@
</script>
<style rel="stylesheet/less" lang="less" scoped>
.h {
height: 600px;
height: 100%;
width: 100%;
margin-top: 10px;
overflow-y: scroll;
......@@ -872,11 +892,15 @@
.hTable{
margin-top: 10px;
}
/deep/.el-select-tree{
width: 100%;
.el-input__inner{
height: 30px !important;
}
}
</style>
\ No newline at end of file
.btnGroup{
text-align: center;
margin-top: 20px;
}
</style>
......
......@@ -4,8 +4,8 @@
<el-row class="searchContent">
<el-col :span="6">
<el-radio-group v-model="scyclx" @change="scyclxChange">
<el-radio-button label="1">实测</el-radio-button>
<el-radio-button label="0">预测</el-radio-button>
<el-radio-button label="1">实测</el-radio-button>
</el-radio-group>
<el-input
maxlength="28"
......@@ -257,13 +257,6 @@
<!-- 双击户的弹出框 -->
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -281,7 +274,6 @@ import addZdy from "./zdy/index";
import addCh from "./ch/index";
import hbj from "./hbj/index";
import lpbContent from "./lpbContent/index";
import {registerCall} from "../../../../api/common";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
export default {
......@@ -312,7 +304,7 @@ export default {
plzlVisible: false,
hbjVisible: false,
hcxlzVisible:false,
scyclx: "1", //1是实测 0是预测
scyclx: "0", //1是实测 0是预测
radio1: "",
radio2: "",
createFlag: false,
......@@ -406,18 +398,6 @@ export default {
}, 100);
},
methods: {
registerCall(){
let data={
type:'h',
bsm:this.hbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
batchCommit(){
if (this.bsms.length <= 0) {
Message.warning("请选择操作户")
......@@ -604,18 +584,6 @@ export default {
});
}
},
//户保存
hbjSaveInfo() {
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户保存
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
},
//调用楼盘表信息查询接口
getlpbData() {
this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
......@@ -648,6 +616,7 @@ export default {
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
//给hBsmList传值
// console.log(bsms,'bsms');
this.$refs.lpbContent.choosedList = bsms;
this.$refs.lpbContent.borderColor = color;
})
......
......@@ -681,6 +681,8 @@ export default {
//父组件中选择单元状态改变选中户的边框颜色
choosedList(n) {
this.$refs.hBsm.forEach((item) => {
// console.log(item.dataset.bsm,'item.dataset.bsm');
// console.log(this.choosedList,'this.choosedList');
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
console.log(item.style.borderColor ,'item.style.borderColor ');
......