Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
a084c209 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 3532e642 f2204302
Inline Side-by-side
Showing 6 changed files with 150 additions and 106 deletions
......@@ -5,7 +5,7 @@
v-for="(items, index) in countList"
:key="items.id"
>
<template v-for="(childItem,childIndex) in items.addQjTdytRequestList" >
<template v-for="(childItem,childIndex) in items.list" >
<el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''">
<el-button
v-show="childIndex<1"
......@@ -78,6 +78,7 @@
<el-date-picker
v-model="childItem.tdsyqssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
</el-date-picker>
......@@ -139,6 +140,7 @@
<el-date-picker
v-model="childItem.tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
</el-date-picker>
......@@ -182,7 +184,7 @@ export default {
"glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
"qlxzdm": "",
"zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
addQjTdytRequestList:[
list:[
{
"pzdjbsm": "",
"pzdjmc": "",
......@@ -219,7 +221,7 @@ export default {
"glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
"qlxzdm": "",
"zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
addQjTdytRequestList:[
list:[
{
"pzdjbsm": "",
"pzdjmc": "",
......@@ -271,11 +273,11 @@ export default {
"tdzh": ""
};
if (type === "add") {
this.countList[index].addQjTdytRequestList.splice(childIndex + 1, 0, insideObj);
this.countList[index].list.splice(childIndex + 1, 0, insideObj);
} else {
this.countList[index].addQjTdytRequestList.forEach((item, childInd) => {
if (childIndex == childInd && this.countList[index].addQjTdytRequestList.length > 1) {
this.countList[index].addQjTdytRequestList.splice(childIndex, 1);
this.countList[index].list.forEach((item, childInd) => {
if (childIndex == childInd && this.countList[index].list.length > 1) {
this.countList[index].list.splice(childIndex, 1);
}
});
}
......
<template>
<div class="main">
<SearchHead @getSearchCondition="getData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -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,65 +43,65 @@
</template>
<script>
import SearchHead from "../../../components/searchHead/searchHead";
export default {
import SearchHead from "../../../components/searchHead/searchHead";
import {getSearchList} from "../../../api/search";
export default {
name: "",
components: { SearchHead },
components: {SearchHead},
props: {},
data() {
return {
total: 0,
pageNo: 1,
pageSize: 10,
queryData: {},
formData: {
user: "",
region: "",
type: [],
},
tableData: [
{
bdcdyh: "610101001001GB00001W",
xmmc: "万科集团万科城",
bdcqzh: "陕（2017）西安市不动产权第00000",
lx: "宗地",
qlr: "李子新",
zl: "灞桥－田家湾-咸宁东路,近浐河西路",
zrsj: "2020.09.07 ",
cjr: "李子新",
},
],
tableData: [],
tableHeight: "",
};
},
created() {},
created() {
},
mounted() {
for (let i = 0; i < 11; i++) {
let obj = {
bdcdyh: "610101001001GB00001W",
xmmc: "万科集团万科城",
bdcqzh: "陕（2017）西安市不动产权第00000",
lx: "自然幢",
qlr: "李子新",
zl: "灞桥－田家湾-咸宁东路,近浐河西路",
zrsj: "2020.09.07 ",
cjr: "李子新",
};
this.tableData.push(obj);
}
this.getData({})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
},
methods: {
onSubmit() {},
tableRowClassName({ row, rowIndex }) {
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.queryData.pageNo = val;
this.getData(this.queryData);
},
getData(data) {
getSearchList(data).then(res => {
this.tableData = res.result.records
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)
},
onSubmit() {
},
tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 !== 0) {
return "even-row";
} else {
return "";
}
},
//获取子组件点击查询触发的事件
getData(obj) {
console.log(obj);
//将obj作为参数调用接口查询表格数据
},
//点击办理
handleClick(row) {
let path = "";
......@@ -119,10 +120,10 @@ export default {
},
computed: {},
watch: {},
};
};
</script>
<style scoped lang="less">
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -147,5 +148,5 @@ export default {
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -194,7 +194,7 @@ export default {
this.close();
this.$router.push("/zd");
} else {
this.$message.error("创建失败！");
this.$message.error(res.message);
}
})
.catch((error) => {});
......
<template>
<div class="main">
<SearchHead @getSearchCondition="getData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -35,7 +35,8 @@
</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-page="pageNo" @current-change="handleCurrentChange">
</el-pagination>
</div>
</div>
......@@ -44,6 +45,7 @@
<script>
import SearchHead from "../../../components/searchHead/searchHead";
import {getSearchList} from "../../../api/search";
export default {
name: "",
......@@ -51,45 +53,47 @@
props: {},
data() {
return {
total: 0,
pageNo: 1,
pageSize: 10,
formData: {
user: "",
region: "",
type: [],
},
tableData: [
{
bdcdyh: "610101001001GB00001W",
xmmc: "万科集团万科城",
bdcqzh: "陕（2017）西安市不动产权第00000",
lx: "宗地",
qlr: "李子新",
zl: "灞桥－田家湾-咸宁东路,近浐河西路",
zrsj: "2020.09.07 ",
cjr: "李子新",
},
],
queryData: {},
tableData: [],
tableHeight: "",
};
},
created() {
},
mounted() {
for (let i = 0; i < 11; i++) {
let obj = {
bdcdyh: "610101001001GB00001W",
xmmc: "万科集团万科城",
bdcqzh: "陕（2017）西安市不动产权第00000",
lx: "自然幢",
qlr: "李子新",
zl: "灞桥－田家湾-咸宁东路,近浐河西路",
zrsj: "2020.09.07 ",
cjr: "李子新",
};
this.tableData.push(obj);
}
this.getData({})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
},
methods: {
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.queryData.pageNo = val;
this.getData(this.queryData);
},
getData(data) {
getSearchList(data).then(res => {
this.tableData = res.result.records
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)
},
onSubmit() {
},
tableRowClassName({row, rowIndex}) {
......@@ -99,11 +103,6 @@
return "";
}
},
//获取子组件点击查询触发的事件
getData(obj) {
console.log(obj);
},
//点击办理
handleClick(row) {
let path = "";
......
......@@ -106,6 +106,7 @@
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = row.glbsm;
path = "/zd";
break;
default:
......
......@@ -192,17 +192,15 @@
<td colspan="2">
<input
type="text"
v-model="formData.rjl"
:class="
formData.jyrjl == '-' ? 'formInput percent47' : 'formInput'
"
v-model="rjl"
v-show="isInterval(formData.jyrjl)"
class="formInput percent47"
/>
<span class="percent4" v-show="formData.jyrjl == '-'">-</span>
<span class="percent4" v-show="isInterval(formData.jyrjl)">-</span>
<input
type="text"
v-show="formData.jyrjl == '-'"
v-model="formData.rjl"
class="formInput percent47"
:class="isInterval(formData.jyrjl) ? 'formInput percent47' : 'formInput'"
/>
</td>
<td colspan="2">容积说明</td>
......@@ -226,17 +224,15 @@
<td colspan="2">
<input
type="text"
v-model="formData.jzmd"
:class="
formData.jyjzmd == '-' ? 'formInput percent47' : 'formInput'
"
v-model="jzmd"
v-show="isInterval(formData.jyjzmd)"
class="formInput percent47"
/>
<span class="percent4" v-show="formData.jyjzmd == '-'">-</span>
<span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span>
<input
type="text"
v-show="formData.jyjzmd == '-'"
v-model="formData.jzmd"
class="formInput percent47"
:class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'"
/>
</td>
<td colspan="2">建筑密度说明</td>
......@@ -260,17 +256,15 @@
<td colspan="2">
<input
type="text"
v-model="formData.jzxg"
:class="
formData.jyjzxg == '-' ? 'formInput percent47' : 'formInput'
"
v-model="jzxg"
v-show="isInterval(formData.jyjzxg)"
class="formInput percent47"
/>
<span class="percent4" v-show="formData.jyjzxg == '-'">-</span>
<span class="percent4" v-show="isInterval(formData.jyjzxg)">-</span>
<input
type="text"
v-show="formData.jyjzxg == '-'"
v-model="formData.jzxg"
class="formInput percent47"
:class="isInterval(formData.jyjzxg) ? 'formInput percent47' : 'formInput'"
/>
</td>
<td colspan="2">建筑限高说明</td>
......@@ -372,6 +366,9 @@ export default {
props: {},
data() {
return {
rjl:'',
jzmd:'',
jzxg:'',
compareList: [
{ label: "<", value: "<" },
{ label: ">", value: ">" },
......@@ -386,7 +383,7 @@ export default {
bhqkbsm: "",
blc: "",
bz: "",
dcrq: "2020-10-22T09:07:38.644Z",
dcrq: "",
dcy: "",
dcyj: "",
djh: "",
......@@ -444,8 +441,37 @@ export default {
getQjZdjbxxDetailById(this.$store.state.zdbsm)
.then((res) => {
if (res.result) {
console.log(res.result);
this.formData = res.result;
//判断容密高是否为区间值，如果是区间值，则将校验值置为'-'并给rjl，jzmd，jzxg赋值
this.rjl = this.isInterval(this.formData.jyrjl) ? this.formData.jyrjl : '';
this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? '-' : this.formData.jyrjl;
this.jzmd = this.isInterval(this.formData.jyjzmd) ? this.formData.jyjzmd : '';
this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? '-' : this.formData.jyjzmd;
this.jzxg = this.isInterval(this.formData.jyjzxg) ? this.formData.jyjzxg : '';
this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? '-' : this.formData.jyjzxg;
if(res.result.list.length>0){
if(res.result.list[0].list.length<1){
res.result.list[0].list.push({
"pzdjbsm": "",
"pzdjmc": "",
"pzytdm": "",
"pzytmc": "",
"pzytmj": 0,
"qlxzbsm": "",
"sjdjbsm": "",
"sjdjmc": "",
"sjytdm": "",
"sjytmc": "",
"sjytmj": 0,
"syqx": "",
"tdsyjssj": "",
"tdsyqssj": "",
"tdzh": ""
})
}
//权利性质数据传给子组件
this.$refs.qlxzModule.countList = res.result.list
}
}
})
.catch((error) => {});
......@@ -465,6 +491,10 @@ export default {
updateZDxx() {
//获取权利性质数据
this.formData.list = this.$refs.qlxzModule.getQlxzDataList();
//判断容密高是否为区间值，如果是区间值，则将输入框的值赋予
this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl;
this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd;
this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? this.jzxg : this.formData.jyjzxg;
updateQjZdjbxx(this.formData)
.then((res) => {
if (res.code == 200) {
......@@ -473,6 +503,8 @@ export default {
message: '保存成功',
type: "success",
});
// 保存成功再次查询
this.getZdjbxxData();
} else {
this.$message({
message: res.message,
......@@ -509,6 +541,15 @@ export default {
})
.catch((error) => {});
},
//判断容密高是否为区间
isInterval(val){
if(val == '>' || val == '<' || val == '=' || val == '>=' || val == '<='){
return false
}else{
return true;
}
},
},
computed: {
zl() {
......