a3ab8480 by 杨威

Merge remote-tracking branch 'origin/master' into master

2 parents a17c7dd3 9dba7c9f
<template>
<div >
<table border="1">
<thead>
<tr rowspan="2">
<th colspan="4">
<h2> 集体土地所有权宗地分类面积调查表</h2><br/>
<div class="dw">
单位:
<el-radio-group v-model="flmjData.dw">
<el-radio :label="3">平方米</el-radio>
<el-radio :label="6">公顷</el-radio>
<el-radio :label="9"></el-radio>
</el-radio-group>
</div>
</th>
</tr>
</thead>
<tbody>
<tr>
<th>权利人</th>
<td colspan="3">
<el-input v-model="flmjData.qlr" disabled></el-input>
</td>
</tr>
<tr>
<th>宗地代码</th>
<td colspan="3">
<el-input v-model="flmjData.zddm" disabled></el-input>
</td>
</tr>
<tr>
<th>不动产单元号</th>
<td colspan="3">
<el-input v-model="flmjData.bdcdyh" disabled></el-input>
</td>
</tr>
<tr >
<th rowspan="7">
分类面积
</th>
<th colspan="2">农用地</th>
<td>
<el-input v-model="flmjData.lyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th rowspan="4">
其他
</th>
<th>
耕地
</th>
<th colspan="2">
<el-input v-model="flmjData.gd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</th>
</tr>
<tr>
<th>林地</th>
<td colspan="2">
<el-input v-model="flmjData.ld" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>
草地
</th>
<td colspan="2">
<el-input v-model="flmjData.cd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>其他</th>
<td colspan="2">
<el-input v-model="flmjData.qt" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>建设用地</th>
<td colspan="3">
<el-input v-model="flmjData.jsyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>
未利用地
</th>
<td colspan="3">
<el-input v-model="flmjData.wlyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th rowspan="2">调查记事</th>
<td colspan="3">
<el-input type="textarea"
:autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.dcjs"></el-input>
</td>
</tr>
<tr>
<td colspan="3">
<el-form :inline="true" :model="flmjData" class="demo-form-inline">
<el-form-item label="调查员:">
<el-input v-model="flmjData.dcy" ></el-input>
</el-form-item>
<el-form-item label="日期:">
<el-input
placeholder="请选择日期"
title="调查日期"
type="date"
v-model="flmjData.dcrq">
</el-input>
</el-form-item>
</el-form>
</td>
</tr>
<tr>
<th rowspan="2">审核意见</th>
<td colspan="3">
<el-input type="textarea"
:autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.shyj"></el-input>
</td>
</tr>
<tr>
<td colspan="3">
<el-form :inline="true" :model="flmjData" class="demo-form-inline">
<el-form-item label="审核员:">
<el-input v-model="flmjData.shy" ></el-input>
</el-form-item>
<el-form-item label="日期:">
<el-input
placeholder="请选择日期"
title="调查日期"
type="date"
v-model="flmjData.shrq">
</el-input>
</el-form-item>
</el-form>
</td>
</tr>
<tr>
<td colspan="4" style="text-align: center">
<el-button>保存</el-button>
</td>
</tr>
</tbody>
</table>
</div>
</template>
<script>
export default {
name: "Fldcb",
data(){
return{
flmjData:{
dw:'', // 单位
qlr:'', // 权利人
zddm:'', // 宗地代码
bdcdyh:'', // 不动产单元号
lyd:'', // 农用地
gd:'', // 耕地
ld:'', // 林地
cd:'', // 草地
qt:'', //其他
jsyd:'', // 建设用地
wlyd:'', // 未利用地
dcjs:"", // 调查记事
dcy:'', // 调查员
dcrq:'', // 调查日期
shyj:'', // 审核意见
shy:'', // 审核员
shrq:'' // 审核日期
}
}
}
}
</script>
<style scoped lang="less">
table{
margin-top: 20px;
background-color: #fff;
font-size: 14px;
width: 100%;
cursor: pointer;
th{
height: 36px;
}
}
.dw{
float: right;
}
.demo-form-inline{
float: right;
}
</style>
......@@ -315,7 +315,7 @@
export default {
name: "",
inject: ['getTreeByS','getRightTree'],
inject: ['getTreeByS','getRightTree','getTreeByBsm'],
components: {zdQueryData,dzQueryData,hfghb},
props: {},
data() {
......@@ -646,14 +646,25 @@
saveDzFg(this.dzFghData).then(res => {
vm.loadingHide()
if (res.success) {
this.getRightTree(res.result,'0,1,2');
if(res.result.zrz!==''&&res.result.zrz!=null){
this.getTreeByBsm(res.result.zrz,'zrz','0,1,2');
this.$router.push({
path: '/zd',
path: '/zrz',
query: {
bsm: res.result,
bsm: res.result.zrz,
source: 3, //分割标识
}
});
}else if(res.result.dz!==''&&res.result.dz!=null){
this.getTreeByBsm(res.result.dz,'dz','0,1,2');
this.$router.push({
path: '/dz',
query: {
bsm: res.result.dz,
source: 3, //分割标识
}
});
}
} else {
Message.error("保存失败")
}
......
......@@ -2,6 +2,7 @@
<!-- <div class="content_box"> -->
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="分类调查表" name="fldcb"><fldcb v-if="fldbcVisible"></fldcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd">
<jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
......@@ -26,10 +27,11 @@ import djb from "./djb";
import lshs from "./lshs";
import fjcl from "./fjcl/fjcl"
import {queryStatus} from "@api/search"
import Fldcb from "@components/Fldcb/Fldcb"
export default {
name: "",
components: {
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb
},
props: {},
data() {
......@@ -38,6 +40,7 @@ export default {
activeName: "djdcb",
mjftbVisible:false,
jzdVisible:false,
fldbcVisible:false,
jzxVisible:false,
djbVisible:false,
lshsVisible:false,
......@@ -67,6 +70,9 @@ export default {
case 'mjftb':
this.mjftbVisible = true;
break;
case 'fldcb':
this.fldbcVisible = true;
break;
case 'jzd':
this.jzdVisible = true;
break;
......