Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
000e2cd7 by zhaoqian
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/App.vue
#	src/components/formMenu/qlr.vue
2 parents debb055d 960a2a53
Inline Side-by-side
Showing 9 changed files with 219 additions and 164 deletions
......@@ -5,31 +5,14 @@
</template>
<script>
import { getDdicByMC } from "../src/api/common";
export default {
mounted() {
window.addEventListener("unload", this.saveState);
this.getDic();
},
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>
......
......@@ -61,7 +61,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.qlrlxbsm">
<el-option
v-for="item in qllxList"
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 zjlxList"
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 zjlxList"
v-for="item in $store.state.zjzlList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -222,7 +222,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="item.zjzlbsm">
<el-option
v-for="item in zjlxList"
v-for="item in $store.state.zjlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......@@ -252,7 +252,7 @@
<td colspan="3">
<el-select class="formSelect" v-model="formData.gyfsbsm">
<el-option
v-for="item in gyfsList"
v-for="item in $store.state.gyfsList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
......
......@@ -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) => {});
......
<template>
<el-form :inline="true" :model="formData" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-input v-model="formData.zdbm" placeholder="输入宗地编码"></el-input>
<el-row>
<el-col :span="18">
<el-row>
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码:">
<el-input v-model="queryData.zddm" placeholder="输入宗地编码" @change="query"></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-input v-model="formData.zl" placeholder="输入坐落地址"></el-input>
<el-form-item label="坐落:">
<el-input v-model="queryData.zl" placeholder="输入坐落地址" @change="query"></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
</el-form>
</el-col>
<el-col :span="2">
<el-button type="primary" @click="query">查询</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form :inline="true" :model="queryData" class="demo-form-inline">
<el-form-item label="不动产单元号:">
<el-input
v-model="formData.bdcdyh"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
@change="query"
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button type="warning" @click="onSubmit">重置</el-button>
<el-button type="primary" class="moreSearchBtn" @click="onSubmit"
>更多查询</el-button
>
</el-form-item>
<el-form-item class="db" label="查询范围">
<el-checkbox-group v-model="formData.type">
<el-checkbox label="宗地" name="type"></el-checkbox>
<el-checkbox label="自然幢" name="type"></el-checkbox>
<el-checkbox label="户" name="type"></el-checkbox>
<el-checkbox label="构筑物" name="type"></el-checkbox>
<el-checkbox label="林权" name="type"></el-checkbox>
<el-checkbox label="宗海" name="type"></el-checkbox>
<el-form-item class="demo-form-inline" label="单元类型:">
<el-checkbox-group v-model="queryData.dylxs" @change="query">
<el-checkbox label="zd" name="type">宗地</el-checkbox>
<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
<el-checkbox label="h" name="type">户</el-checkbox>
<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="lq" name="type">林权</el-checkbox>
<el-checkbox label="zh" name="type">宗海</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
</el-col>
<el-col :span="2">
<el-button type="warning" @click="reset">重置</el-button>
</el-col>
</el-row>
<el-row class="row3">
<el-col :span="22" v-show="ismore">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="权利人名称:">
<el-input placeholder="输入权利人名称" v-model="queryData.qlrmc" @change="query"></el-input>
</el-form-item>
<el-form-item label="项目名称:">
<el-input placeholder="输入项目名称" v-model="queryData.xmmc" @change="query"></el-input>
</el-form-item>
<el-form-item label="不动产权证号:">
<el-input placeholder="输入不动产权证号" v-model="queryData.bdcqzh" @change="query"></el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="2" :offset="offset">
<el-button type="primary" class="moreSearchBtn" @click="ismore=!ismore">更多查询
</el-button>
</el-col>
</el-row>
</el-col>
</el-row>
</template>
<script>
export default {
export default {
name: "",
components: {},
props: {},
data() {
return {
formData: {
zdbm: "",
zl: "",
offset: 22,
ismore: false,
queryData: {
bdcdyh: "",
type: [],
},
bdcqzh: "",
dylxs: [],
qlrmc: "",
qszt: "",
xmmc: "",
zddm: "",
zl: ""
}
};
},
created() {
let self = this;
document.onkeydown = function(e) {
document.onkeydown = function (e) {
//按下回车提交
let key = window.event.keyCode;
//事件中keycode=13为回车事件
......@@ -58,15 +98,47 @@ export default {
}
};
},
mounted() {},
mounted() {
},
methods: {
onSubmit() {
reset() {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
dylxs: [],
qlrmc: "",
qszt: "",
xmmc: "",
zddm: "",
zl: ""
};
this.query()
},
query() {
//子组件点击查询时将表单数据发送给父组件
this.$emit("getSearchCondition", this.formData);
this.$emit("getSearchCondition", this.queryData);
},
},
computed: {},
watch: {},
};
watch: {
"ismore": function (val) {
if (val) {
this.offset = 0
} else {
this.offset = 22
this.queryData.qlrmc = "";
this.queryData.xmmc = "";
this.queryData.bdcqzh = "";
}
}
},
};
</script>
<style scoped lang="less"></style>
<style scoped lang="less">
.el-button {
width: 100px;
}
.row3{
height: 55px;
}
</style>
......
......@@ -10,15 +10,15 @@ Vue.use(Vuex)
const store = new Vuex.Store({
state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
zdbsm: '',
xzqList: [],
djqList: [],
djzqList: [],
zjzlList:[],
gjList:[],
ssList:[],
qlrlxList:[],
xbList:[],
sshyList:[],
xzqList: [],
djqList: [],
djzqList: [],
//创建自然幢时需要用到的临时存储信息
zrzbsm: '',
xmmc: '',
......
......@@ -35,30 +35,26 @@
<div class="header-bottom">
<Navigation ref="navigation"></Navigation>
</div>
<el-dialog
title="新建"
:visible.sync="dialogVisible"
width="40%"
>
<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,
LineTree,
......@@ -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,30 @@
// 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;
},
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 +321,12 @@
//关闭新建子组件弹框
closeDialog() {
this.dialogVisible = false;
}
},
};
},
};
</script>
<style lang="less" scoped>
.home-box {
.home-box {
width: 100%;
height: 100vh;
.el-container {
......@@ -419,5 +431,5 @@
// line-height: 160px;
padding: 0;
}
}
}
</style>
......
......@@ -83,8 +83,9 @@
</el-form-item>
<el-form-item label="特征码">
<el-select
v-model="tzmCode"
placeholder="地籍子区"
v-model="zdtzm.value"
placeholder="宗地特征码"
@change="changeZdtzm(zdtzm.value)"
style="width:200px;"
>
<el-option
......@@ -203,8 +204,8 @@ export default {
djzqbsm: this.djzqValue,
syqlxbsm: this.syqlxCode,
xmmc: this.zdProjectName,
// zdtzmbsm: this.tzmCode,
zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010",
zdtzmbsm: this.tzmCode,
//zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010",
};
insertQjZdjbxx(data)
.then((res) => {
......@@ -310,6 +311,12 @@ export default {
this.syqlxCode = id;
console.log(this.syqlxCode);
},
changeZdtzm(id){
this.tzmCode=id;
console.log(this.tzmCode);
},
close() {
this.$emit("closeDialog");
},
......
......@@ -12,7 +12,8 @@
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理</el-button
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template>
......@@ -27,7 +28,7 @@
</el-table-column>
<el-table-column prop="qlr" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"> </el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
<el-table-column prop="zrsj" align="left" width="120" label="转入时间">
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
......@@ -42,10 +43,11 @@
</template>
<script>
import SearchHead from "../../../components/searchHead/searchHead";
export default {
import SearchHead from "../../../components/searchHead/searchHead";
export default {
name: "",
components: { SearchHead },
components: {SearchHead},
props: {},
data() {
return {
......@@ -69,7 +71,8 @@ export default {
tableHeight: "",
};
},
created() {},
created() {
},
mounted() {
for (let i = 0; i < 11; i++) {
let obj = {
......@@ -87,8 +90,9 @@ export default {
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
},
methods: {
onSubmit() {},
tableRowClassName({ row, rowIndex }) {
onSubmit() {
},
tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 !== 0) {
return "even-row";
} else {
......@@ -99,7 +103,6 @@ export default {
//获取子组件点击查询触发的事件
getData(obj) {
console.log(obj);
//将obj作为参数调用接口查询表格数据
},
//点击办理
handleClick(row) {
......@@ -119,10 +122,10 @@ export default {
},
computed: {},
watch: {},
};
};
</script>
<style scoped lang="less">
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -143,9 +146,10 @@ export default {
}
.dataGrid {
flex: 1;
margin-top: 20px;
.pagination {
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -12,7 +12,8 @@
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理</el-button
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template>
......@@ -27,14 +28,14 @@
</el-table-column>
<el-table-column prop="qlr" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"> </el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
<el-table-column prop="zrsj" align="left" width="120" label="转入时间">
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next" :total="1000"
<el-pagination background layout="prev, pager, next" :total="total"
@current-change="handleCurrentChange"
:current-page.sync="currentPage">
</el-pagination>
......@@ -44,55 +45,53 @@
</template>
<script>
import SearchHead from "../../../components/searchHead/searchHead";
import {getSearchList} from "../../../api/search";
export default {
import SearchHead from "../../../components/searchHead/searchHead";
import {getSearchList} from "../../../api/search";
export default {
name: "",
components: { SearchHead },
components: {SearchHead},
props: {},
data() {
return {
pageNo:1,
pageSize:10,
zddm:'',
zl:'',
bdcdyh:'',
dylx:'',
qlrmc:'',
xmmc:'',
bdcqzh:'',
formData: {
user: "",
region: "",
type: [],
},
total:0,
pageNo: 1,
pageSize: 10,
tableData: [],
tableHeight: "",
};
},
created() {},
created() {
},
mounted() {
this.loadList();
this.getData({})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
},
methods: {
onSubmit() {},
tableRowClassName({ row, rowIndex }) {
onSubmit() {
},
tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 !== 0) {
return "even-row";
} else {
return "";
}
},
handleCurrentChange(val){
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo=val;
this.loadList();
this.pageNo = val;
this.getData({});
},
//获取子组件点击查询触发的事件
getData(obj) {
console.log(obj);
//将obj作为参数调用接口查询表格数据
obj['pageNo'] = this.pageNo
obj['pageSize'] = this.pageSize
getSearchList(obj).then(res => {
this.tableData = res.result.records
this.total=res.result.total
})
},
//点击办理
handleClick(row) {
......@@ -108,40 +107,20 @@ export default {
break;
}
this.$router.push({
path:path,
query:{
bsm:row.glbsm,
source:2
path: path,
query: {
bsm: row.glbsm,
source: 2
}
});
},
loadList(){
let params={
zddm:this.zddm,
zl:this.zl,
bdcdyh:this.bdcdyh,
dylx:this.dylx,
qlrmc:this.qlrmc,
xmmc:this.xmmc,
bdcqzh:this.bdcqzh,
pageNo:this.pageNo,
pageSize:this.pageSize,
}
getSearchList(params).then((res)=>{
console.log(res)
if(res.code===200){
this.tableData=res.result.records;
console.log(this.tableData)
}
})
}
},
computed: {},
watch: {},
};
};
</script>
<style scoped lang="less">
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -166,5 +145,5 @@ export default {
padding: 18px 0;
}
}
}
}
</style>
......