Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
6ffa52b0 by 杨威
Options

自然幢表单验证及权利人组件修改

1 parent 84cf8218
Expand all
Inline Side-by-side
Showing 7 changed files with 180 additions and 20 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;
......
......@@ -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",
......
......@@ -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"
......
......@@ -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;
......@@ -717,7 +717,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) {
......
......@@ -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"
......