Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
bd36467b by 焦泽平
Options

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

2 parents c77667b4 543e13c6
Inline Side-by-side
Showing 9 changed files with 217 additions and 162 deletions
......@@ -5,31 +5,14 @@
</template>
<script>
import { getDdicByMC } from "../src/api/common";
export default {
mounted() {
this.getDic();
window.addEventListener("unload", this.saveState);
},
methods: {
saveState() {
sessionStorage.setItem("state", JSON.stringify(this.$store.state));
},
//请求字典数据
getDic() {
let s = this.$store.state;
s.zjzlList = s.zjzlList.length == 0 ? this.getDicData("证件种类") : s.zjzlList;
s.gjList = s.gjList.length == 0 ? this.getDicData("国家和地区") : s.gjList;
s.ssList = s.ssList.length == 0 ? this.getDicData("省市") : s.ssList;
s.qlrlxList = s.qlrlxList.length == 0 ? this.getDicData("权利人类型") : s.qlrlxList;
s.xbList = s.xbList.length == 0 ? this.getDicData("性别") : s.xbList;
s.sshyList = s.sshyList.length == 0 ? this.getDicData("国民经济行业分类代码") : s.sshyList;
},
getDicData(name) {
getDdicByMC(name).then((res) => {
return res.result;
});
},
},
};
</script>
......
import request from '@/plugin/axios'
/**
* 新增权利人法人代理人
*/
export function insertQlrDlrFr(data) {
return request({
url: '/system/Qlr/insertQlrDlrFr',
method: 'post',
data: data,
})
}
/**
* 根据glbsm查询qlr信息
*/
export function getQlrInfoByGlbsm(data) {
return request({
url: '/system/Qlr/getQlrByGlbsm',
method: 'get',
params: {
glbsm:data
},
})
}
\ No newline at end of file
......@@ -61,7 +61,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.qlrlxbsm">
<el-option
v-for="item in qlrlxList"
v-for="item in $store.state.qlrlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -75,7 +75,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.zjzlbsm">
<el-option
v-for="item in zlzlList"
v-for="item in $store.state.zjzlList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -103,7 +103,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.gjbsm">
<el-option
v-for="item in gjList"
v-for="item in $store.state.gjList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -115,7 +115,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.hjszssbsm">
<el-option
v-for="item in ssList"
v-for="item in $store.state.ssList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -129,7 +129,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.xbbsm">
<el-option
v-for="item in xbList"
v-for="item in $store.state.xbList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -147,7 +147,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.sshy">
<el-option
v-for="item in sshyList"
v-for="item in $store.state.sshyList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -176,7 +176,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.fr.zjzlbsm">
<el-option
v-for="item in zjzlList"
v-for="item in $store.state.zjzlList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -199,7 +199,7 @@
<td colspan="10">代理人信息</td>
</tr>
<template v-for="(item, index) in formData.dlr">
<tr :key="item.zjh">
<tr :key="item.index">
<td rowspan="2" class="btnCol">
<el-button
type="primary"
......@@ -222,7 +222,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="item.zjzlbsm">
<el-option
v-for="item in zjzlList"
v-for="item in $store.state.zjzlList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -231,7 +231,8 @@
</el-select>
</td>
</tr>
<tr :key="item.dh">
<!-- <tr :key="item.dh">-->
<tr :key="'dh'+item.index">
<td>证件号码</td>
<td colspan="3">
<input type="text" class="formInput" v-model="item.zjh" />
......@@ -251,7 +252,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.gyfsbsm">
<el-option
v-for="item in qlrlxList"
v-for="item in $store.state.gyfsList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -283,7 +284,7 @@
</table>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false"
<el-button type="primary" @click="addNewQlrInfo"
>确 定</el-button
>
<el-button @click="dialogVisible = false">取 消</el-button>
......@@ -293,20 +294,30 @@
</template>
<script>
export default {
import {getDdicByMC} from "../../api/common";
import {insertQlrDlrFr,getQlrInfoByGlbsm} from "../../api/qlr";
export default {
props: {
widtd: {
type: String,
default: "70%",
},
title: {
type: String,
default: "",
},
topHeight: {
type: String,
default: "15vh",
// widtd: {
// type: String,
// default: "70%",
// },
// title: {
// type: String,
// default: "",
// },
// topHeight: {
// type: String,
// default: "15vh",
// },
lx: {
type:String,
},
bsm: {
type:String,
required:true
}
},
data() {
return {
......@@ -316,6 +327,7 @@ export default {
multipleSelection: {},
dialogVisible: false,
formData: {
addQjDlrFrRequest:[],
dlr: [
{
dh: "",
......@@ -356,12 +368,13 @@ export default {
zjh: "",
zjzlbsm: "",
},
qlrlxList: this.$store.state.qlrlxList,
zjzlList: this.$store.state.zjzlList,
xbList: this.$store.state.xbList,
gjList: this.$store.state.gjList,
ssList: this.$store.state.ssList,
sshyList: this.$store.state.sshyList,
// qlrlxList: [],
// zjzlList: [],
// gjList: [],
// ssList: [],
// xbList: [],
// sshyList: [],
// gyfsList: [],
};
},
methods: {
......@@ -376,6 +389,25 @@ export default {
this.dialogVisible = true;
}
},
addNewQlrInfo(){
//todo 权利人页面调整
this.formData.glbsm=this.bsm;
//将代理人，法人数据合在一起，名称为addQjDlrFrRequest；
//法人的type字段类型为0
this.formData.fr.type=0;
this.formData.addQjDlrFrRequest.push(this.formData.fr);
for(let k=0;k<this.formData.dlr.length;k++){
this.formData.dlr[k].type=1;
this.formData.addQjDlrFrRequest.push(this.formData.dlr[k]);
}
insertQlrDlrFr(this.formData).then((res)=>{
if(res.code===200){
this.tableData.push(this.formData);
Object.assign(this.$data, this.$options.data())
this.dialogVisible = false;
}
})
},
//修改行数据
changeRow() {
if (this.multipleSelection.length == 1) {
......@@ -442,8 +474,27 @@ export default {
});
}
},
getQlrInfo(){
console.log("===========================")
console.log(this.bsm)
getQlrInfoByGlbsm(this.bsm).then((res)=>{
if(res.code){
if(res.result!=null){
this.tableData=res.result;
}
}
})
}
},
created(){
console.log("===========================cres")
console.log(this.bsm)
this.getQlrInfo();
},
};
mounted() {
}
};
</script>
<style lang="less">
.temp {
......
......@@ -211,14 +211,12 @@ export default {
getDicData(){
getDdicByMC("土地用途")
.then((res) => {
console.log(res.result);
this.pzytList = res.result;
this.sjytList = res.result;
})
.catch((error) => {});
getDdicByMC("土地等级")
.then((res) => {
console.log(res.result);
this.djList = res.result;
})
.catch((error) => {});
......
......@@ -5,25 +5,29 @@ import user from './modules/user'
import permission_routes from './modules/permission_routes'
import setTabs from './modules/setTabs'
Vue.use(Vuex)
Vue.use(Vuex);
const store = new Vuex.Store({
state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
zdbsm: '',
xzqList: [],
djqList: [],
djzqList: [],
qllxList:[],
zdtzmList:[],
qlsdfsList:[],
zjzlList:[],
gjList:[],
ssList:[],
qlrlxList:[],
xbList:[],
sshyList:[],
xzqList: [],
djqList: [],
djzqList: [],
//创建自然幢时需要用到的临时存储信息
zrzbsm: '',
xmmc: '',
zdmj: '',
zdzl: ''
zdzl: '',
zjlxList: [],
gyfsList: [],
},
modules: {
user,
......
......@@ -15,7 +15,7 @@
</div>
</el-aside>
<el-container>
<el-header height="100px">
<el-header>
<div class="header-top">
<div class="top-items" @click="toggleClick">
<i class="fa fa-outdent hamburger" v-show="!isActive"></i>
......@@ -32,35 +32,31 @@
<span>{{ item.name }}</span>
</div>
</div>
<div class="header-bottom">
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
</div>
<el-dialog
title="新建"
:visible.sync="dialogVisible"
width="40%"
>
</div> -->
<el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
<Create @closeDialog="closeDialog"></Create>
</el-dialog>
</el-header>
<el-main>
<router-view/>
<router-view />
</el-main>
</el-container>
</el-container>
</div>
</template>
<script>
import util from "@/libs/util.js";
import Navigation from "../components/IvyElement/navigation";
import Create from "./panel/create/index";
import LineTree from "../components/lineTree/lineTree";
import {setTimeout} from "timers";
import {getTree} from "../api/common"
import util from "@/libs/util.js";
import Navigation from "../components/IvyElement/navigation";
import Create from "./panel/create/index";
import LineTree from "../components/lineTree/lineTree";
import { setTimeout } from "timers";
import { getTree,getDdicByMC } from "../api/common";
export default {
export default {
components: {
Navigation,
// Navigation,
LineTree,
Create,
},
......@@ -187,7 +183,7 @@
},
},
watch: {
"$route.path": function (newPath) {
"$route.path": function(newPath) {
//监测路由变化，高亮顶部导航
this.headTop.forEach((item, index) => {
item.select = false;
......@@ -195,13 +191,13 @@
item.select = true;
}
});
if(newPath == '/zd'){
this.getRightTree(this.$store.state.zdbsm)
if (newPath == "/zd") {
this.getRightTree(this.$store.state.zdbsm);
}
},
"$store.state.zdbsm": function (bsm) {
this.getRightTree(bsm)
}
"$store.state.zdbsm": function(bsm) {
this.getRightTree(bsm);
},
},
created() {
if (this.$route.meta) {
......@@ -223,7 +219,7 @@
icon: "fa fa-address-card-o",
path: "/add",
},
{name: "更正", icon: "fa fa-address-card-o", path: "/modify"},
{ name: "更正", icon: "fa fa-address-card-o", path: "/modify" },
{
name: "变更",
icon: "fa fa-address-card-o",
......@@ -243,14 +239,34 @@
// this.navSelect(indId);
// this.sortNavigation(this.navigationList, indId);
// }
this.getDic();
},
methods: {
//请求字典数据
async getDic() {
let s = this.$store.state;
s.zjzlList = s.zjzlList.length == 0 ?await this.getDicData("证件种类") : s.zjzlList;
s.gjList = s.gjList.length == 0 ?await this.getDicData("国家和地区") : s.gjList;
s.ssList = s.ssList.length == 0 ?await this.getDicData("省市") : s.ssList;
s.qlrlxList = s.qlrlxList.length == 0 ?await this.getDicData("权利人类型") : s.qlrlxList;
s.xbList = s.xbList.length == 0 ? await this.getDicData("性别") : s.xbList;
s.sshyList = s.sshyList.length == 0 ?await this.getDicData("所属行业") : s.sshyList;
s.qllxList = s.qllxList.length == 0 ?await this.getDicData("权利类型") : s.qllxList;
s.zdtzmList = s.zdtzmList.length == 0 ?await this.getDicData("宗地（宗海）特征码") : s.sshyList;
s.qlsdfsList = s.qlsdfsList.length == 0 ?await this.getDicData("权利设定方式") : s.qlsdfsList;
s.gyfsList = s.gyfsList.length == 0 ?await this.getDicData("共有方式") : s.gyfsList;
},
async getDicData(name) {
return await getDdicByMC(name).then((res)=> {
return res.result
});
},
getRightTree(bsm) {
getTree(bsm).then(res => {
getTree(bsm).then((res) => {
if (res.success) {
this.pd=res.result
this.pd = res.result;
}
})
});
},
sortNavigation(data, selectId) {
let headTop = this.headTop;
......@@ -309,12 +325,12 @@
//关闭新建子组件弹框
closeDialog() {
this.dialogVisible = false;
}
},
};
},
};
</script>
<style lang="less" scoped>
.home-box {
.home-box {
width: 100%;
height: 100vh;
.el-container {
......@@ -419,5 +435,5 @@
// line-height: 160px;
padding: 0;
}
}
}
</style>
......
<template>
<div class="main">
<SearchHead @getSearchCondition="getData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -36,8 +36,7 @@
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next" :total="total"
@current-change="handleCurrentChange"
:current-page.sync="currentPage">
:current-page="pageNo" @current-change="handleCurrentChange">
</el-pagination>
</div>
</div>
......@@ -54,11 +53,12 @@
props: {},
data() {
return {
total:0,
total: 0,
pageNo: 1,
pageSize: 10,
tableData: [],
tableHeight: "",
queryData: {}
};
},
created() {
......@@ -80,19 +80,24 @@
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getData({});
this.queryData.pageNo = val;
this.getData(this.queryData);
},
//获取子组件点击查询触发的事件
getData(obj) {
console.log(obj);
//将obj作为参数调用接口查询表格数据
obj['pageNo'] = this.pageNo
obj['pageSize'] = this.pageSize
getSearchList(obj).then(res => {
getData(data) {
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total=res.result.total
this.total = res.result.total
})
},
//获取子组件点击查询触发的事件
geQuerytData(obj) {
this.queryData = obj
//将obj作为参数调用接口查询表格数据
this.queryData['pageSize'] = this.pageSize
this.pageNo = 1
this.queryData['pageNo'] = 1
this.getData(this.queryData)
},
//点击办理
handleClick(row) {
let path = "";
......
......@@ -2,7 +2,6 @@
<div class="main">
<div class="formMenu">
<Qlr ref="qlrxxModule"></Qlr>
<!-- <el-button
type="primary"
class="changeBtn"
......@@ -28,7 +27,7 @@
@change="changeXzq(formData.xzqbsm)"
>
<el-option
v-for="item in xzqList"
v-for="item in $store.state.xzqList"
:key="item.xzqbsm"
:label="item.xzqmc"
:value="item.xzqbsm"
......@@ -44,7 +43,7 @@
@change="changeDjq(formData.djqbsm)"
>
<el-option
v-for="item in djqList"
v-for="item in $store.state.djqList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -56,7 +55,7 @@
<td colspan="2">
<el-select class="formSelect" v-model="formData.djzqbsm">
<el-option
v-for="item in djzqList"
v-for="item in $store.state.djzqList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -70,7 +69,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.qllxbsm">
<el-option
v-for="item in qllxList"
v-for="item in $store.state.qllxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -82,7 +81,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.zdtzmbsm">
<el-option
v-for="item in zdtzmList"
v-for="item in $store.state.zdtzmList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -96,7 +95,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.qlsdfs">
<el-option
v-for="item in qlsdfsList"
v-for="item in $store.state.qlsdfsList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -152,7 +151,7 @@
<td colspan="4">
<el-select class="formSelect" v-model="formData.gmjjhyfl">
<el-option
v-for="item in gmjjhyflList"
v-for="item in $store.state.sshyList"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -180,8 +179,8 @@
</tr>
<tr>
<td colspan="2">容积率</td>
<td colspan="4">
<el-select class="formSelect percent30" v-model="formData.rjl">
<td colspan="2">
<el-select class="formSelect" v-model="formData.rjl">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -190,7 +189,9 @@
>
</el-option>
</el-select>
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">
<input type="text" class="formInput"/>
</td>
<td colspan="2">容积说明</td>
<td colspan="4" class="psr">
......@@ -199,8 +200,8 @@
</tr>
<tr>
<td colspan="2">建筑密度</td>
<td colspan="4">
<el-select class="formSelect percent30" v-model="formData.jzmd">
<td colspan="2">
<el-select class="formSelect" v-model="formData.jzmd">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -209,7 +210,9 @@
>
</el-option>
</el-select>
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">
<input type="text" class="formInput"/>
</td>
<td colspan="2">建筑密度说明</td>
<td colspan="4" class="psr">
......@@ -218,8 +221,8 @@
</tr>
<tr>
<td colspan="2">建筑限高</td>
<td colspan="4">
<el-select class="formSelect percent30" v-model="formData.jzxg">
<td colspan="2">
<el-select class="formSelect" v-model="formData.jzxg">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -228,6 +231,8 @@
>
</el-option>
</el-select>
</td>
<td colspan="2">
<input type="text" class="formInput percent68"/>
</td>
<td colspan="2">建筑限高说明</td>
......@@ -321,14 +326,9 @@
props: {},
data() {
return {
qllxList: [],
zdtzmList: [],
qlsdfsList: [],
gmjjhyflList: [],
xzqList: this.$store.state.xzqList,
djqList: this.$store.state.djqList,
djzqList: this.$store.state.djzqList,
compareList: [
{label: "<", value: "<"},
{label: ">", value: ">"},
{label: "=", value: "="},
{label: "<=", value: "<="},
{label: ">=", value: ">="},
......@@ -369,7 +369,6 @@
};
},
created() {
this.getDicData();
this.getZdjbxxData();
},
mounted() {
......@@ -407,37 +406,6 @@
getQlxzData() {
console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据
},
//获取字典数据信息
getDicData() {
getDdicByMC("权利类型")
.then((res) => {
console.log(res.result);
this.qllxList = res.result;
})
.catch((error) => {
});
getDdicByMC("宗地（宗海）特征码")
.then((res) => {
console.log(res.result);
this.zdtzmList = res.result;
})
.catch((error) => {
});
getDdicByMC("权利设定方式")
.then((res) => {
console.log(res.result);
this.qlsdfsList = res.result;
})
.catch((error) => {
});
getDdicByMC("国民经济行业分类代码")
.then((res) => {
console.log(res.result);
this.gmjjhyflList = res.result;
})
.catch((error) => {
});
},
//行政区划选择
changeXzq(id) {
getListByXzqbsm(id)
......
<template>
<div class="zrz content-form" v-loading="loading">
<el-form ref="form" :model="form" label-width="160px">
<Qlr ref="qlrxxModule"></Qlr>
<Qlr ref="qlrxxModule" :lx="lx" :bsm="zrzbsm"></Qlr>
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable">
<tbody>
<tr height="30">
......@@ -280,6 +280,8 @@
},
data () {
return {
lx:"zrz",
zrzbsm:'',
form:{
zrzbsm:'', //自然幢标识码
zdbsm:'', //宗地标识码
......@@ -395,7 +397,6 @@
}
},
onSave(){
console.log(this.form)
this.loading=true;
// this.form.qlxzList=this.$refs.qlxzModule.getQlxzDataList();
this.form.qlxzList=
......@@ -532,16 +533,17 @@
getZrzDetailByBsm(data){
getZrzDetailByBsm(data).then((res)=>{
if(res.code===200){
console.log(res.result)
this.form=res.result;
}
})
}
},
created(){
consoleLog(data){
console.log("============================")
console.log(data)
}
},
mounted() {
created(){
this.getDDic();
//todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
this.source = this.$route.query.source;
......@@ -551,10 +553,14 @@
this.getZddm(this.$store.zdbsm);
this.form.xmmc=this.$store.xmmc;
this.form.zrzbsm=this.$store.zrzbsm;
}else {
this.zrzbsm=this.$route.query.bsm;
this.getZrzDetailByBsm(this.$route.query.bsm)
this.consoleLog(this.zrzbsm)
}
},
mounted() {
}
}
</script>
......