Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9ff93aac by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 385cbfc1 76a3cd95
Expand all
Inline Side-by-side
Showing 11 changed files with 345 additions and 100 deletions
......@@ -51,8 +51,8 @@
@click="handleInClick(index, childIndex, 'minus')"
>-</el-button
>
<!-- </template> -->
</el-col>
<template v-if="hasSyqx">
<el-col
:span="3"
:key="childIndex + '7'"
......@@ -230,6 +230,116 @@
</ul>
</el-col>
</template>
<template v-if="!hasSyqx">
<el-col
:span="5"
:key="childIndex + '7'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>批准用途</li>
<li>实际用途</li>
<li>土地使用起始时间<i class="requisite">*</i></li>
</ul>
</el-col>
<el-col
:span="5"
:key="childIndex + '6'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.pzytdm"
></el-select-tree>
</li>
<li>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.sjytdm"
></el-select-tree>
</li>
<li>
<el-date-picker
v-model="childItem.tdsyqssj"
ref="tdsyqssj"
:picker-options="childItem.pickerStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@input="startTime(index,childIndex)"
>
</el-date-picker>
</li>
</ul>
</el-col>
<el-col
:span="5"
:key="childIndex + '5'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>地类编码</li>
<li>地类编码</li>
<li>土地使用结束时间<i class="requisite">*</i></li>
</ul>
</el-col>
<el-col
:span="5"
:key="childIndex + '4'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>
<input
type="text"
style="top: -1px;"
v-model="childItem.pzytdm"
class="formInput"
/>
</li>
<li>
<input
type="text"
v-model="childItem.sjytdm"
class="formInput"
/>
</li>
<li>
<el-date-picker
v-model="childItem.tdsyjssj"
ref="tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
:picker-options="childItem.pickerEnd"
placeholder="选择日期"
@input="endTime(index,childIndex)"
>
</el-date-picker>
</li>
</ul>
</el-col>
</template>
</template>
<div class="title">
<el-select-tree
......@@ -260,6 +370,10 @@ export default {
return {};
},
},
hasSyqx:{
type:Boolean,
default:false
}
},
data() {
return {
......@@ -348,7 +462,6 @@ export default {
this.countList[index].list[childIndex].tdsyjssj = Number(startTime.substring(0,4))+Number(syqx)+startTime.slice(4,10);
},
endTime(index,childIndex,e){
console.log(e,'eeeeee');
let startTime = this.countList[index].list[childIndex].tdsyqssj;
let endTime = this.countList[index].list[childIndex].tdsyjssj;
this.countList[index].list[childIndex].pickerStart={
......@@ -479,13 +592,6 @@ export default {
rule: /^\s*$/g, //非空
},
{
data:item.list[ind].syqx,
name:'使用期限',
dom:this.$refs.syqx[temp+ind],
// val:this.$refs.syqx[temp+ind].value,
rule: /^\s*$/g, //非空
},
{
data:item.list[ind].tdsyjssj,
name:'土地使用结束时间',
dom:this.$refs.tdsyjssj[temp+ind],
......@@ -496,6 +602,17 @@ export default {
if (ind == item.list.length-1) {
temp += item.list.length;
}
if(this.hasSyqx){
rules.push(
{
data:item.list[ind].syqx,
name:'使用期限',
dom:this.$refs.syqx[temp+ind],
// val:this.$refs.syqx[temp+ind].value,
rule: /^\s*$/g, //非空
}
)
}
})
})
this.rulesResult = true;
......@@ -503,8 +620,10 @@ export default {
if(item.rule.test(item.data) || item.data == null){
if(item.dom.$el){
item.dom.$el.style.border = '1px solid red';
item.dom.$el.style.boxSizing = 'border-box';
}else{
item.dom.style.border = '1px solid red';
item.dom.style.boxSizing = 'border-box';
}
// this.$message({
// // message: item.name+'不能为空',
......@@ -526,12 +645,14 @@ export default {
e.$el.style.border=""
}else{
e.$el.style.border="1px solid red"
e.$el.style.boxSizing = 'border-box';
}
}else{
if(e.target.value!=''){
e.target.style.border=""
}else{
e.target.style.border="1px solid red"
e.target.style.boxSizing = 'border-box';
}
}
},
......
......@@ -101,9 +101,11 @@
<li>
<el-date-picker
v-model="childItem.tdsyqssj"
:picker-options="childItem.pickerStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@input="startTime(index,childIndex)"
>
</el-date-picker>
</li>
......@@ -148,7 +150,9 @@
v-model="childItem.tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
:picker-options="childItem.pickerEnd"
placeholder="选择日期"
@input="endTime(index,childIndex)"
>
</el-date-picker>
</li>
......@@ -221,6 +225,8 @@ export default {
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
pickerStart:{},
pickerEnd:{},
tdzh: "",
},
],
......@@ -317,6 +323,42 @@ export default {
getQlxzDataList() {
return this.countList;
},
//起始时间判断
startTime(index,childIndex){
let startTime= this.countList[index].list[childIndex].tdsyqssj;
let endTime=this.countList[index].list[childIndex].tdsyjssj;
this.countList[index].list[childIndex].pickerEnd={
disabledDate: (time) => {
if (Object.keys(startTime).length>0) {
return new Date(startTime).getTime()>time.getTime();
}else {
return time.getTime()< Date.now();
}
}
}
if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
let startYear= new Date(startTime).getFullYear();
let endYear=new Date(endTime).getFullYear();
}
},
endTime(index,childIndex,e){
console.log(e,'eeeeee');
let startTime = this.countList[index].list[childIndex].tdsyqssj;
let endTime = this.countList[index].list[childIndex].tdsyjssj;
this.countList[index].list[childIndex].pickerStart={
disabledDate: (time) => {
if (Object.keys(endTime).length>0) {
return new Date(endTime).getTime()<time.getTime();
}else {
return time.getTime() > Date.now();
}
}
}
if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
let startYear= new Date(startTime).getFullYear();
let endYear=new Date(endTime).getFullYear();
}
},
},
};
</script>
......
......@@ -187,7 +187,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
</td>
</tr>
<tr></tr>
......@@ -218,7 +218,7 @@
</template>
<script>
import Qlxz from "./../../components/formMenu/qlxz_simple";
import Qlxz from "./../../components/formMenu/qlxz";
import {batchUpdateQjH} from "../../api/h";
export default {
name: "plH",
......
......@@ -3,14 +3,60 @@
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
width="70%"
@close="close"
:modal-append-to-body="false"
center>
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-row :gutter="10" class="shop">
<!-- <el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button> -->
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
v-model="queryData.bdcqzh"
placeholder="输入不动产权证号"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="权利人">
<el-input
v-model="queryData.qlrmc"
placeholder="输入权利人"
></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落"
></el-input>
</el-form-item>
</el-form>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
</el-col>
......@@ -23,10 +69,10 @@
<el-col :span="8" class="">
<el-input v-model="queryData.bdcqzh"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
</el-row> -->
<!-- <el-row :gutter="10">
<el-col :span="4" class="inputtitle">
不动产权单元号:
不动产单元号:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.bdcdyh"></el-input>
......@@ -45,7 +91,7 @@
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
</el-col>
</el-row>
</el-row> -->
<table border="1">
<tr>
<td>序号</td>
......@@ -77,8 +123,6 @@
</table>
</div>
<span slot="footer" class="dialog-footer">
</span>
<div class="page">
<el-pagination
background
......@@ -146,7 +190,7 @@
this.queryData.pageNo = val;
this.getData(this.queryData);
},
result: function () {
reset: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
......@@ -178,7 +222,7 @@
},
close: function () {
this.$emit('close')
this.result();
this.reset();
}
},
watch: {
......@@ -197,6 +241,10 @@
height: auto;
width: 80%;
}
/deep/ .el-form-item__label{
width: 96px;
text-align: right;
}
table {
margin-top: 10px;
......@@ -233,5 +281,8 @@
.noData {
color: #b2b2b2;
}
.page{
margin-top: 20px;
}
</style>
......
......@@ -3,47 +3,54 @@
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
width="70%"
@close="close"
:modal-append-to-body="false"
center>
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
不动产权证号:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.bdcqzh"></el-input>
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
v-model="queryData.bdcqzh"
placeholder="输入不动产权证号"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
</el-form>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
不动产权单元号:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.bdcdyh"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
权利人:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.qlrmc"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
坐落:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="权利人">
<el-input
v-model="queryData.qlrmc"
placeholder="输入权利人"
></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落"
></el-input>
</el-form-item>
</el-form>
</el-col>
</el-row>
<table border="1">
......@@ -77,8 +84,6 @@
</table>
</div>
<span slot="footer" class="dialog-footer">
</span>
<div class="page">
<el-pagination
background
......@@ -146,7 +151,7 @@
this.queryData.pageNo = val;
this.getData(this.queryData);
},
result: function () {
reset: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
......@@ -178,7 +183,7 @@
},
close: function () {
this.$emit('close')
this.result();
this.reset();
}
},
watch: {
......@@ -197,6 +202,11 @@
height: auto;
width: 80%;
}
/deep/ .el-form-item__label{
width: 96px;
text-align: right;
}
table {
margin-top: 10px;
......@@ -233,5 +243,8 @@
.noData {
color: #b2b2b2;
}
.page{
margin-top: 20px;
}
</style>
......
......@@ -439,7 +439,7 @@ export default {
width: 100%;
height: 100vh;
position: relative;
min-width: 1500px;
min-width: 1680px;
overflow-x: auto;
.calcWidth{
width: calc(100% - 300px);
......
......@@ -141,7 +141,7 @@
<tr>
<td colspan="12" align="center">
<Qlxz ref="qlxzModule" :formData="form"></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
</td>
</tr>
......@@ -207,7 +207,7 @@
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz_simple";
import Qlxz from "../../../components/formMenu/qlxz";
import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit,registerCall} from "../../../api/common"
......
......@@ -190,18 +190,37 @@
<span class="tips">分割前多幢信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="fgq">
<div class="data">
<ul>
<li><span>宗地代码:</span>{{dzFgqData.zddm}}</li>
<li><span>不动产单元号:</span>{{dzFgqData.bdcdyh}}</li>
<li><span>项目名称:</span>{{dzFgqData.xmmc}}</li>
<li><span>不动产权证号:</span>{{dzFgqData.bdcqzh}}</li>
<li><span>权利人:</span>{{dzFgqData.qlr}}</li>
<li><span>坐落:</span>{{dzFgqData.zl}}</li>
<el-card class="data">
<div slot="header" class="clearfix">
<span>多幢基本信息</span>
</div>
<ul class="zdjbxx">
<li><span class="label">宗地代码:</span><span class="value">{{dzFgqData.zddm}}</span></li>
<li><span class="label">不动产单元号:</span><span class="value">{{dzFgqData.bdcdyh}}</span></li>
<li><span class="label">项目名称:</span><span class="value">{{dzFgqData.xmmc}}</span></li>
<li><span class="label">不动产权证号:</span><span class="value">{{dzFgqData.bdcqzh}}</span></li>
<li><span class="label">权利人:</span><span class="value">{{dzFgqData.qlr}}</span></li>
<li><span class="label">坐落:</span><span class="value">{{dzFgqData.zl}}</span></li>
</ul>
<div class="zdmap">
</div>
</el-card>
<div class="zxx">
<div class="dz">
<el-card class="zrz">
<div slot="header" class="clearfix">
<span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{zdZxx.zrzList.length}}</span>幢</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index+item.xmmc"
:class="tempBsmList.indexOf(item.bsm) > -1 ? 'hasChoosed':''"
>
<i class="iconfont iconziranchuang"></i> {{item.displays}}
</li>
</ul>
</el-card>
<!-- <div class="dz">
<div class="title">
<span>多幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
......@@ -218,14 +237,21 @@
:class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}}
</li>
</ul>
</div>
</div> -->
</div>
</div>
<div class="fgh">
<span class="tips">分割后多幢信息</span>
<table border="1">
<tr>
<th class="cz">操作</th>
<th class="cz">
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+
</el-button>
</th>
<th class="xzq">行政区</th>
<th class="djq">地籍区</th>
<th class="djzq">地籍子区</th>
......@@ -297,22 +323,6 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
</tr>
<tr>
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+
</el-button>
</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
......@@ -714,6 +724,7 @@
}
},
saveZd() {
if(this.tempBsmList.length == (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
zdfg(this.zdFghData).then(res => {
if (res.success) {
this.$store.state.zdbsms = res.result;
......@@ -728,6 +739,9 @@
Message.error("保存失败")
}
})
}else{
this.$message.warning("幢信息未选择完成，无法保存")
}
},
saveDz() {
......
......@@ -301,7 +301,7 @@
</tr>
<tr>
<td colspan="12">
<Qlxz ref="qlxzModule" :formData="formData"></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='true' :formData="formData"></Qlxz>
</td>
</tr>
<tr>
......@@ -479,9 +479,9 @@ export default {
console.log(res.result,'res.result');
this.getXzqData(res.result.xzqbsm,res.result.djqbsm);
//如果没有宗地代码，自动生成
if(res.result.zddm == null){
this.generatorCode()
}
// if(res.result.zddm == null){
// this.generatorCode()
// }
//判断容密高是否为区间值，如果是区间值，则将校验值置为'-'并给rjl，jzmd，jzxg赋值
this.rjl = this.isInterval(this.formData.jyrjl) ? this.formData.jyrjl : '';
this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? '-' : this.formData.jyrjl;
......@@ -702,8 +702,10 @@ export default {
if(item.rule.test(item.data) || item.data == null){
if(item.dom.$el){
item.dom.$el.style.border = '1px solid red';
item.dom.$el.style.boxSizing = 'border-box';
}else{
item.dom.style.border = '1px solid red';
item.dom.style.boxSizing = 'border-box';
}
// this.$message({
// // message: item.name+'不能为空',
......@@ -717,7 +719,8 @@ export default {
this.$nextTick(()=>{
if(flag){
//宗地面积处理
this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'')
// console.log(this.formData.zdmj,'this.formData.zdmj');
// this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'')
updateQjZdjbxx(this.formData)
.then((res) => {
if (res.code == 200) {
......@@ -774,7 +777,8 @@ export default {
if(e.target.value!=''){
e.target.style.border=""
}else{
e.target.style.border="1px solid red"
e.target.style.border="1px solid red";
e.target.style.boxSizing = 'border-box';
}
},
//提交宗地基本信息
......
......@@ -310,7 +310,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
</td>
</tr>
<tr></tr>
......@@ -403,7 +403,7 @@
<script>
import Qlr from "./../../../../../components/formMenu/qlr";
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import Qlxz from "./../../../../../components/formMenu/qlxz";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz";
import {submit,registerCall} from "./../../../../../api/common"
......