Skip to content

任超 / js.CadastralSystem

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

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

2 parents 55135939 c34224b9
Inline Side-by-side
Showing 10 changed files with 141 additions and 58 deletions
......@@ -47,9 +47,9 @@
<el-checkbox label="dz" 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="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="lq" name="type">林权</el-checkbox>
<el-checkbox label="zh" name="type">宗海</el-checkbox>
<el-checkbox label="zh" name="type">宗海</el-checkbox> -->
</el-checkbox-group>
</el-form-item>
</el-form>
......
......@@ -209,6 +209,7 @@
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit} from "../../../api/common"
export default {
name:'zrz',
components:{
......@@ -416,6 +417,17 @@
},
onSubmit(){
console.log(this.form)
let data={
glbsm:this.bsm,
status:1,
type:"dz"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
this.getDzDetailByBsm(this.$route.query.bsm)
}
})
},
getZddm(zdbsm){
getQjZdjbxxDetailById(zdbsm).then((res)=>{
......
......@@ -16,12 +16,12 @@
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
</tr>
<tr v-if="bgqData.length==0">
<tr v-if="zdhbqData.length==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in bgqData" :key="index">
<tr v-else v-for="(item,index) in zdhbqData" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
readonly="readonly"/></td>
......@@ -52,7 +52,7 @@
</tr>
<tr>
<td class="xzq">
<el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
<el-select v-model="zdhbhData.xzqbsm" @change="changeXzq(zdhbhData.xzqbsm)">
<el-option
v-for="i in xzq"
:key="i.bsm"
......@@ -62,7 +62,7 @@
</el-select>
</td>
<td class="djq">
<el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
<el-select v-model="zdhbhData.djqbsm" @change="changeDjq(zdhbhData.djqbsm)">
<el-option
v-for="i in djq"
:key="i.bsm"
......@@ -72,7 +72,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hbhData.djzqbsm">
<el-select v-model="zdhbhData.djzqbsm">
<el-option
v-for="i in djzq"
:key="i.bsm"
......@@ -82,7 +82,7 @@
</el-select>
</td>
<td class="tdtzm">
<el-select v-model="hbhData.syqlxbsm">
<el-select v-model="zdhbhData.syqlxbsm">
<el-option
v-for="i in syq"
:key="i.value"
......@@ -92,7 +92,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hbhData.zdtzmbsm">
<el-select v-model="zdhbhData.zdtzmbsm">
<el-option
v-for="i in tdtzm"
:key="i.bsm"
......@@ -102,7 +102,7 @@
</el-select>
</td>
<td class="xmmc">
<input type="text" v-model="hbhData.xmmc" class="formInput"/>
<input type="text" v-model="zdhbhData.xmmc" class="formInput"/>
</td>
<td class="zxx">
<span class="xz">选择</span>
......@@ -122,7 +122,7 @@
<div class="hb-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="hbq">
<span class="tips">合并前宗地信息</span>
<span class="tips">合并前多幢信息</span>
<table border="1">
<tr>
<td class="xh">序号</td>
......@@ -133,12 +133,12 @@
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
</tr>
<tr v-if="bgqData.length==0">
<tr v-if="dzhbqData.length==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in bgqData" :key="index">
<tr v-else v-for="(item,index) in dzhbqData" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
readonly="readonly"/></td>
......@@ -156,7 +156,7 @@
</table>
</div>
<div class="hbh">
<span class="tips">合并后宗地信息</span>
<span class="tips">合并后多幢信息</span>
<table border="1">
<tr>
<th class="xzq">行政区</th>
......@@ -169,7 +169,7 @@
</tr>
<tr>
<td class="xzq">
<el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
<el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)">
<el-option
v-for="i in xzq"
:key="i.bsm"
......@@ -179,7 +179,7 @@
</el-select>
</td>
<td class="djq">
<el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
<el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)">
<el-option
v-for="i in djq"
:key="i.bsm"
......@@ -189,7 +189,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hbhData.djzqbsm">
<el-select v-model="dzhbhData.djzqbsm">
<el-option
v-for="i in djzq"
:key="i.bsm"
......@@ -199,7 +199,7 @@
</el-select>
</td>
<td class="tdtzm">
<el-select v-model="hbhData.syqlxbsm">
<el-select v-model="dzhbhData.syqlxbsm">
<el-option
v-for="i in syq"
:key="i.value"
......@@ -209,7 +209,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hbhData.zdtzmbsm">
<el-select v-model="dzhbhData.zdtzmbsm">
<el-option
v-for="i in tdtzm"
:key="i.bsm"
......@@ -219,7 +219,7 @@
</el-select>
</td>
<td class="xmmc">
<input type="text" v-model="hbhData.xmmc" class="formInput"/>
<input type="text" v-model="dzhbhData.xmmc" class="formInput"/>
</td>
<td class="zxx">
<span class="xz">选择</span>
......@@ -238,7 +238,7 @@
<div class="hb-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="hbq">
<span class="tips">合并前宗地信息</span>
<span class="tips">合并前户信息</span>
<table border="1">
<tr>
<td class="xh">序号</td>
......@@ -249,12 +249,12 @@
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
</tr>
<tr v-if="bgqData.length==0">
<tr v-if="hhbqData.length==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in bgqData" :key="index">
<tr v-else v-for="(item,index) in hhbqData" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
readonly="readonly"/></td>
......@@ -272,7 +272,7 @@
</table>
</div>
<div class="hbh">
<span class="tips">合并后宗地信息</span>
<span class="tips">合并后户信息</span>
<table border="1">
<tr>
<th class="xzq">行政区</th>
......@@ -285,7 +285,7 @@
</tr>
<tr>
<td class="xzq">
<el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
<el-select v-model="hhbhData.xzqbsm" @change="changeXzq(hhbhData.xzqbsm)">
<el-option
v-for="i in xzq"
:key="i.bsm"
......@@ -295,7 +295,7 @@
</el-select>
</td>
<td class="djq">
<el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
<el-select v-model="hhbhData.djqbsm" @change="changeDjq(hhbhData.djqbsm)">
<el-option
v-for="i in djq"
:key="i.bsm"
......@@ -305,7 +305,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hbhData.djzqbsm">
<el-select v-model="hhbhData.djzqbsm">
<el-option
v-for="i in djzq"
:key="i.bsm"
......@@ -315,7 +315,7 @@
</el-select>
</td>
<td class="tdtzm">
<el-select v-model="hbhData.syqlxbsm">
<el-select v-model="hhbhData.syqlxbsm">
<el-option
v-for="i in syq"
:key="i.value"
......@@ -325,7 +325,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="hbhData.zdtzmbsm">
<el-select v-model="hhbhData.zdtzmbsm">
<el-option
v-for="i in tdtzm"
:key="i.bsm"
......@@ -335,7 +335,7 @@
</el-select>
</td>
<td class="xmmc">
<input type="text" v-model="hbhData.xmmc" class="formInput"/>
<input type="text" v-model="hhbhData.xmmc" class="formInput"/>
</td>
<td class="zxx">
<span class="xz">选择</span>
......@@ -372,8 +372,12 @@
return {
tabName: 'zd',
centerDialogVisible: false,
zdFgqData: [],
hbhData: {},
zdhbqData: [], // 宗地合并前数据
dzhbqData: [], // 多幢合并前数据
hhbqData: [], // 户合并前数据
zdhbhData: {}, // 宗地合并后数据
dzhbhData: {}, // 多幢合并后数据
hhbhData: {}, // 户合并后数据
fgBoxWidth: 0,
xzq: [],
djq: [],
......@@ -421,8 +425,22 @@
changeXzq(id) {
this.djq = [];
this.djzq = [];
this.hbhData.djqbsm = ''
this.hbhData.djzqbsm = ''
switch (this.tabName) {
case "zd":
this.zdhbqData.djqbsm = '';
this.zdhbqData.djzqbsm = '';
break
case "dz":
this.dzhbqData.djqbsm = '';
this.dzhbqData.djzqbsm = '';
break
case "h":
this.hhbqData.djqbsm = '';
this.hhbqData.djzqbsm = '';
break
default:
break
}
getListByXzqbsm(id)
.then((res) => {
if (res.result == null) {
......@@ -436,7 +454,19 @@
},
changeDjq(item) {
this.djzq = [];
this.hbhData.djzqbsm = ''
switch (this.tabName) {
case "zd":
this.zdhbqData.djzqbsm = '';
break
case "dz":
this.dzhbqData.djzqbsm = '';
break
case "h":
this.hhbqData.djzqbsm = '';
break
default:
break
}
if (item == null) {
} else {
getListByPbsm(item)
......@@ -460,12 +490,20 @@
newAdd: function () {
this.centerDialogVisible = true;
},
addData: function (val) {
this.centerDialogVisible = false;
this.zdFgqData.push(val)
},
getData: function (data) {
this.zdFgqData.push(data)
switch (this.tabName) {
case "zd":
this.zdhbqData.push(data)
break
case "dz":
this.dzhbqData.push(data)
break
case "h":
this.hhbqData.push(data)
break
default:
break;
}
},
},
computed: {},
......
......@@ -82,7 +82,7 @@
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane>
<!-- <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane> -->
<el-tab-pane class="eltabspane" label="自然幢" name="zrz">
<el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject">
<el-form-item label="项目名称" prop="xmmc">
......@@ -115,8 +115,8 @@
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane class="eltabspane" label="林权" name="lq">林权</el-tab-pane>
<el-tab-pane class="eltabspane" label="构筑物" name="gzw">构筑物</el-tab-pane>
<!-- <el-tab-pane class="eltabspane" label="林权" name="lq">林权</el-tab-pane>
<el-tab-pane class="eltabspane" label="构筑物" name="gzw">构筑物</el-tab-pane> -->
</el-tabs>
</template>
<script>
......@@ -217,10 +217,10 @@ export default {
},
methods: {
// 重置
result(){
this.$refs['ruleForm'].resetFields()
this.$refs["ruleForm1"].resetFields()
this.$refs["ruleForm2"].resetFields()
reset(){
this.$refs['ruleForm'].resetFields();
this.$refs["ruleForm1"].resetFields();
this.$refs["ruleForm2"].resetFields();
},
handleClick(tab, event) {
console.log(tab, event);
......@@ -260,13 +260,13 @@ export default {
this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
insertZrzjbxx(this.ruleForm1)
.then((res) => {
debugger
if (res.code == "200") {
this.$message({
message: "创建成功！",
type: "success",
});
//todo 跳转到自然幢基本信息内容表页面 (预留)
this.close();
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.zrzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
......@@ -276,6 +276,7 @@ export default {
bsm:res.result.bsm
}
});
this.close();
} else {
this.$message.error("创建失败！");
}
......@@ -370,7 +371,7 @@ export default {
},
close() {
this.$emit("closeDialog");
this.result();
this.reset();
},
},
computed: {},
......
......@@ -591,6 +591,7 @@ export default {
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！")
this.getZdjbxxData(this.$store.state.zdbsm);
}
})
},
......
......@@ -53,6 +53,10 @@ export default {
type: Boolean,
default: false,
},
scyclx:{
type: String,
default: "1",
},
},
data() {
return {
......@@ -67,7 +71,7 @@ export default {
zdymc:"",
zdybsm: "",
zrzbsm: "",
scyclx: "0",
scyclx: "1",
qsc: "",
jsc: "",
hs: "",
......@@ -130,7 +134,7 @@ export default {
ljzbsm: "",
zdybsm: "",
zrzbsm: "",
scyclx: "0",
scyclx: this.scyclx,
qsc: "",
jsc: "",
hs: "",
......@@ -165,6 +169,13 @@ export default {
immediate: true,
deep: true,
},
scyclx:{
handler(n){
this.$nextTick(()=>{
this.formData.scyclx = this.scyclx;
})
}
}
},
};
</script>
......
......@@ -411,7 +411,11 @@
Qlxz,
},
props:{
bsm:String //户标识码
bsm:String, //户标识码
scyclx:{
type: String,
default: "1",
},
},
data () {
return {
......@@ -792,6 +796,15 @@
this.form.bdcdyh=res.result;
})
},
},
watch: {
scyclx:{
handler(n){
this.$nextTick(()=>{
this.form.scyclx = this.scyclx;
})
}
}
}
}
</script>
......
......@@ -224,6 +224,7 @@
<div class="addCh" v-show="menuType == 'ch'">
<addCh
ref="ch"
:scyclx="scyclx"
:dialogVisible="dialogVisible"
:treeData="treeData"
></addCh>
......@@ -248,7 +249,7 @@
></h-cxlz>
<!-- 双击户的弹出框 -->
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<hbj ref="hbj" :bsm="hbsm"></hbj>
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
......@@ -572,7 +573,7 @@ export default {
plScYcChange() {
let data = {
zrzbsm: this.$store.state.zrzbsm,
scyclx: "0",
scyclx: this.scyclx,
};
batchScYcChange(data).then((res) => {
if (res.code === 200) {
......@@ -606,7 +607,7 @@ export default {
getDyztBsmList() {
let data = {
zrzbsm: this.$store.state.zrzbsm,
scyclx: "0",
scyclx: this.scyclx,
};
getLpbTj(data).then((res) => {
if (res.code === 200) {
......@@ -663,7 +664,7 @@ export default {
getLpbFwytAndQlxz(){
let data = {
zrzbsm: this.$store.state.zrzbsm,
scyclx: "0",
scyclx: this.scyclx,
};
getLpbFwytAndQlxz(data).then((res) => {
if (res.code === 200) {
......
......@@ -241,7 +241,12 @@ export default {
highest = 0;
}
} else {
// this.zdyWidth = 124;
//有且仅有独立层户
if(this.$refs.hBsm != undefined){
this.$refs.hBsm.forEach((item) => {
this.zdyWidth += item.offsetWidth + 21;
});
}
}
//计算逻辑幢下的幢单元和层户的高度
......
......@@ -432,7 +432,8 @@
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！")
this.$message.success("提交完成！");
this.getZrzDetailByBsm(this.$route.query.bsm)
}
})
},
......