Skip to content

任超 / js.CadastralSystem

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

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

2 parents 36e2bd77 1b0d010a
Inline Side-by-side
Showing 12 changed files with 347 additions and 243 deletions
......@@ -2,7 +2,7 @@ import store from '../../store/index'
import axios from 'axios'
import router from '../../router'
import {Message, MessageBox} from 'element-ui'
import { Loading } from 'element-ui';
// import { Loading } from 'element-ui';
import {httpStatus} from '@/api/config'
// 创建一个 axios 实例
......@@ -19,7 +19,7 @@ const service = axios.create({
function errorLog() {
//请求完成关闭loading
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
// loadingInstance.close();
// });
MessageBox.alert('报错了请联系管理员', '消息提示', {
confirmButtonText: '确定',
......@@ -27,7 +27,7 @@ function errorLog() {
})
}
//定义loading
let loadingInstance = null
// let loadingInstance = null
// 请求拦截器
service.interceptors.request.use(
......@@ -37,12 +37,12 @@ service.interceptors.request.use(
// 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
// config.headers['authkey'] = token
//请求发送成功显示loading
loadingInstance = Loading.service({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.5)'
});
// loadingInstance = Loading.service({
// lock: true,
// text: 'Loading',
// spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.5)'
// });
return config
},
error => {
......@@ -59,7 +59,7 @@ service.interceptors.response.use(
const {code} = dataAxios
//请求完成关闭loading
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
// loadingInstance.close();
// });
// 根据 code 进行判断
if (code === undefined) {
......@@ -90,7 +90,7 @@ service.interceptors.response.use(
},
error => {
if (error && error.response) {
loadingInstance.close();
// loadingInstance.close();
switch (error.response.status) {
case 400:
error.message = '请求错误';
......
......@@ -70,6 +70,11 @@ const constantRoutes = [
name: "宗地",
code: "1-5",
component: () => import("@/views/zd/index"),
},{
path: "/h",
name: "户",
code: "1-6",
component: () => import("@/views/systemH/index"),
},
{
path: "/viewMap",
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import dzxx from "./dzxx";
import fjcl from "./../zd/fjcl/fjcl"
export default {
name: "",
components: {
dzxx
dzxx,fjcl
},
props: {},
data() {
return {
activeName: "dzxx",
dzJbxxVisble:false,
fjclVisible:false
};
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
switch (tab.name) {
case 'dzxx':
this.dzJbxxVisble = true;
break
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
created() {},
......
......@@ -127,7 +127,7 @@
this.$store.state.zdbsm = row.glbsm
break;
case "h":
path = "h";
path = "/h";
this.$store.state.hbsm = row.glbsm
type = "2";
default:
......
......@@ -6,30 +6,34 @@
<span class="tips">分割前宗地信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="fgq">
<div class="data">
<ul>
<li><span>宗地代码:</span>{{zdFgqData.zddm}}</li>
<li><span>不动产单元号:</span>{{zdFgqData.bdcdyh}}</li>
<li><span>项目名称:</span>{{zdFgqData.xmmc}}</li>
<li><span>不动产权证号:</span>{{zdFgqData.bdcqzh}}</li>
<li><span>权利人:</span>{{zdFgqData.qlr}}</li>
<li><span>坐落:</span>{{zdFgqData.zl}}</li>
<el-card class="data">
<div slot="header" class="clearfix">
<span>基本信息</span>
</div>
<ul>
<li><span class="label">宗地代码:</span><span class="value">{{zdFgqData.zddm}}</span></li>
<li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li>
<li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li>
<li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li>
<li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlr}}</span></li>
<li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li>
</ul>
</div>
</el-card>
<div class="zxx">
<div class="dz">
<div class="title">
<el-card class="dz">
<div slot="header" class="clearfix">
<span>多幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="[{'search':!zdDzList.includes(item)}]"
>{{item.displays}}
><span class="label">多幢名称:</span> <span class="value">{{item.displays}}</span>
</li>
</ul>
</div>
<div class="zrz">
<div class="title">
</el-card>
<el-card class="zrz">
<div slot="header" class="clearfix">
<span>自然幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
......@@ -38,7 +42,8 @@
{{item.displays}}
</li>
</ul>
</div>
<div class="line"></div>
</el-card>
</div>
</div>
<div class="fgh">
......@@ -53,7 +58,25 @@
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="xzzxx">幢信息</th>
<th class="">选择</th>
<!-- <th class="">选择</th> -->
</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>
<td></td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
<td class="cz">
......@@ -66,7 +89,7 @@
>
</td>
<td class="xzq">
<el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
<el-select class="" v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
<el-option
v-for="i in xzq"
:key="i.bsm"
......@@ -76,7 +99,7 @@
</el-select>
</td>
<td class="djq">
<el-select v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)">
<el-select class="" v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)">
<el-option
v-for="i in djq"
:key="i.bsm"
......@@ -86,7 +109,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="item.djzqbsm">
<el-select class="" v-model="item.djzqbsm">
<el-option
v-for="i in djzq"
:key="i.bsm"
......@@ -96,7 +119,7 @@
</el-select>
</td>
<td class="tdtzm">
<el-select v-model="item.syqlxbsm">
<el-select class="" v-model="item.syqlxbsm">
<el-option
v-for="i in syq"
:key="i.value"
......@@ -106,7 +129,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="item.zdtzmbsm">
<el-select class="" v-model="item.zdtzmbsm">
<el-option
v-for="i in tdtzm"
:key="i.bsm"
......@@ -119,7 +142,7 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="xzzxx">
<span>多幢:</span>
<!-- <span>多幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex"
@mouseenter="mouseenter($event,index,dzIndex,'dz')"
......@@ -135,9 +158,14 @@
>{{zrzItem.xmmc}}
<span v-if="zrzIndex<item.zrz.length-1">,</span>
</li>
</ul>
</ul> -->
<span class="zxx">自然幢1 <i class="fa fa-times"></i></span>
<span class="zxx">自然幢2 <i class="fa fa-times"></i></span>
<span class="zxx">自然幢3 <i class="fa fa-times"></i></span>
<span class="zxx">多幢1 <i class="fa fa-times"></i></span>
<span class="choose">选择</span>
</td>
<td class="">
<!-- <td class="">
<el-dropdown @command="dzHandleCommand($event,index)">
<span class="el-dropdown-link">
选择多幢<i class="el-icon-arrow-down el-icon--right"></i>
......@@ -160,25 +188,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</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>
<td></td>
</td> -->
</tr>
</table>
</div>
......@@ -988,59 +998,98 @@
.fgq {
margin-left: 20px;
margin-top: 20px;
margin-top: 14px;
display: flex;
flex-direction: column;
flex-flow: nowrap;
.data {
.data{
width: 36%;
}
.el-card {
border: 1px solid #E6E6E6;
background-color: white;
height: 180px;
overflow: auto;
.clearfix{
span{
color: #9B9B9B;
}
}
/deep/ .el-card__body{
padding:10px 12px;
}
ul {
li {
padding: 5px;
line-height: 20px;
color: #BBB;
span {
color: #000;
.label{
color: #4A4A4A;
display: inline-block;
width: 104px;
text-align: right;
}
.value{
color: #6D7278;
padding-left: 10px;
}
}
}
}
.zxx {
width: calc(64% - 40px);
margin-left: 20px;
display: flex;
flex-direction: column;
flex-flow: nowrap;
background-color: white;
.title {
color: red;
text-align: center;
padding: 5px 0;
}
/deep/ .el-card__body{
height: 200px;
overflow-y: scroll;
position: relative;
}
.line{
width: 1px;
height: calc(100% - 20px);
background-color: #EDEDED;
position: absolute;
top: 10px;
left: 50%;
}
.dz {
width: 33%;
border-right: 1px solid #000;
height: 180px;
overflow: auto;
ul {
overflow: auto;
li {
padding: 5px;
text-align: center;
line-height: 20px;
ul{
li{
width: 96% !important;
}
}
}
.zrz {
width: 66%;
height: 180px;
margin-left: 20px;
overflow: auto;
ul {
li {
padding: 5px;
width: 48%;
text-align: center;
display: inline-block;
}
ul {
overflow: auto;
li {
width: 48%;
padding: 5px;
text-align: left;
line-height: 20px;
display: inline-block;
.label{
width: 90px;
}
}
li:nth-of-type(even){
.label{
width: 110px;
text-indent: 20px;
}
}
}
......@@ -1051,53 +1100,44 @@
border-right: 1px solid #000;
}
.fgq .data {
width: 30%;
border: 1px solid #000;
}
.fgq .zxx {
width: 67%;
margin-left: 20px;
border: 1px solid #000;
}
.fg-tabs {
height: auto;
width: 100%;
position: relative;
top: 36px;
.table {
margin-top: 12px;
box-sizing: border-box;
padding: 18px;
}
.addBtn {
/* position: absolute;
right: 30px;
top: -46px;
z-index: 999;*/
position: absolute;
right: 24px;
top: -14px;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:nth-of-type(odd) {
background: #FAFAFA;
th {
height: 36px;
}
}
.formInput {
width: calc(100% - 40px);
/deep/.el-input__inner {
margin: 0;
height: 36px;
height: 44px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
tr:nth-of-type(odd) {
background: #FAFAFA;
}
tr{
th,td{
height: 44px;
}
}
tr:hover {
background-color: #F5F7FA;
}
......@@ -1124,10 +1164,14 @@
/*padding: 0 18px;*/
height: 480px;
overflow: auto;
margin-top: 10px;
margin-top: 26px;
table {
margin: 0 20px;
}
.tips {
display: inline-block;
margin-bottom: 14px;
}
}
.header-button {
height: 50px;
......@@ -1161,11 +1205,26 @@
}
.xzzxx {
ul {
li {
display: inline-block;
.zxx{
padding-right: 16px;
position: relative;
i{
color: #9F9F9F;
position: absolute;
right: 12px;
top: -8px;
display: none;
}
}
.zxx:hover{
>i{
display: inline;
}
}
.choose{
color: #30A4FD;
cursor: pointer;
}
}
.cz, .xh {
......
......@@ -38,11 +38,6 @@
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
</el-tooltip>
<!-- <el-button type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button> -->
</template>
</el-table-column>
</el-table>
......@@ -52,15 +47,6 @@
</el-pagination>
</div>
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
......@@ -68,11 +54,10 @@
<script>
import SearchHead from "../../../components/searchHead/searchHead";
import {getSearchList} from "../../../api/search";
import hbj from "./../../zrz/lpb/bjlp/hbj/index";
export default {
name: "",
components: {SearchHead,hbj},
components: {SearchHead},
props: {},
data() {
return {
......@@ -82,9 +67,6 @@
tableData: [],
tableHeight: 0,
queryData: {},
hbjVisible: false,
hbsm:'',
tabPosition: "1", //1是实测 0是预测
};
},
created() {
......@@ -106,20 +88,6 @@
return "";
}
},
//户保存
hbjSaveInfo() {
this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户提交
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
},
handleCurrentChange(val) {
this.pageNo = val;
this.queryData.pageNo = val;
......@@ -159,17 +127,8 @@
case "h":
case "h0":
case "h1":
this.hbsm = row.glbsm;
this.hbjVisible = true;
if(row.dylx === "h0"){
this.tabPosition = 0;
}else {
this.tabPosition = 1;
}
this.$nextTick(()=>{
console.log(this.$refs.hbj);
this.$refs.hbj.getHInfo(this.hbsm);
});
path="/h";
this.$store.state.hbsm=row.glbsm
break;
default:
break;
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="户基本信息表" name="hjbxx">
<hbj :bsm="hbsm"></hbj>
</el-tab-pane>
<el-tab-pane label="登记簿" name="djb">
<djb v-if="djbVisible"></djb>
</el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible"></fjcl>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import hbj from "./../zrz/lpb/bjlp/hbj/index"
import djb from "./../zd/djb/index";
import fjcl from "./../zd/fjcl/fjcl"
export default {
name: "index",
components: {
hbj, djb, fjcl
},
data() {
return {
hbsm:this.$store.state.hbsm,
activeName: "hjbxx",
djbVisible: false,
fjclVisible: false,
}
},
mounted() {
},
methods: {
handleClick(tab, event) {
// console.log(tab, event);
switch (tab.name) {
case 'djb':
this.djbVisible = true;
break;
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
watch: {}
}
</script>
<style scoped>
</style>
......@@ -106,6 +106,7 @@
window.open(`/api/file/download?url=`+url);
},
getFileList() {
console.log(this.$route.name,'NAME')
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
......@@ -115,6 +116,14 @@
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
break
case "多幢":
this.filesData.dylx = 'dz';
this.filesData.glbsm = this.$store.state.dzbsm
break
case "户":
this.filesData.dylx = 'h';
this.filesData.glbsm = this.$store.state.hbsm
break;
default:
break
}
......
......@@ -95,8 +95,8 @@ export default {
);
const tooltip = new G6.Tooltip({
offsetX: 210,
offsetY: 210,
offsetX: 10,
offsetY: 10,
itemTypes: ['node', 'edge'],
getContent: (e) => {
const outDiv = document.createElement('div');
......
......@@ -21,7 +21,7 @@
<td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
<!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80"></el-input>
<el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag"></el-input>
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
......@@ -37,36 +37,36 @@
</td>
<td colspan="2" align="center" >层号</td>
<td colspan="4" >
<el-input v-model="form.ch"></el-input>
<el-input v-model="form.ch" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >实际层数</td>
<td colspan="4" >
<el-input v-model="form.sjcs"></el-input>
<el-input v-model="form.sjcs" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >实际层</td>
<td colspan="4" >
<el-input v-model="form.sjc"></el-input>
<el-input v-model="form.sjc" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >所在单元</td>
<td colspan="4" >
<el-input v-model="form.zdymc"></el-input>
<el-input v-model="form.zdymc" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >房屋编号</td>
<td colspan="4" >
<el-input v-model="form.fwbh"></el-input>
<el-input v-model="form.fwbh" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwlxbsm" placeholder="请选择" >
<el-select v-model="form.fwlxbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.fwlxList"
:key="item.bsm"
......@@ -77,7 +77,7 @@
</td>
<td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -91,18 +91,18 @@
<tr height="30">
<td colspan="2" align="center" >户号</td>
<td colspan="4" >
<el-input v-model="form.hh"></el-input>
<el-input v-model="form.hh" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >室号</td>
<td colspan="4" >
<el-input v-model="form.shbw"></el-input>
<el-input v-model="form.shbw" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >户型</td>
<td colspan="4" >
<el-select v-model="form.hxbsm" placeholder="请选择" >
<el-select v-model="form.hxbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.hxList"
:key="item.bsm"
......@@ -113,7 +113,7 @@
</td>
<td colspan="2" align="center" >户型结构</td>
<td colspan="4" >
<el-select v-model="form.hxjgbsm" placeholder="请选择" >
<el-select v-model="form.hxjgbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.hxjgList"
:key="item.bsm"
......@@ -127,7 +127,7 @@
<tr height="30">
<td colspan="2" align="center" >产别<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -138,7 +138,7 @@
</td>
<td colspan="2" align="center" >产权来源<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -153,62 +153,62 @@
<td colspan="2" rowspan="6" align="center" >预测</td>
<td colspan="2" align="center" >建筑面积（㎡） </td>
<td colspan="2" align="center" >
<el-input v-model="form.ycjzmj" :disabled="form.scyclx==='1'"></el-input>
<el-input v-model="form.ycjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" rowspan="6" align="center" >实测</td>
<td colspan="2" align="center" >建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.scjzmj" :disabled="form.scyclx==='0'"></el-input>
<el-input v-model="form.scjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >套内建筑面积（㎡））</td>
<td colspan="2" align="center" >
<el-input v-model="form.yctnjzmj" :disabled="form.scyclx==='1'"></el-input>
<el-input v-model="form.yctnjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >套内建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.sctnjzmj" :disabled="form.scyclx==='0'"></el-input>
<el-input v-model="form.sctnjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >分摊建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycftjzmj" :disabled="form.scyclx==='1'"></el-input>
<el-input v-model="form.ycftjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.scftjzmj" :disabled="form.scyclx==='0'"></el-input>
<el-input v-model="form.scftjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >地下部分建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycdxbfjzmj" :disabled="form.scyclx==='1'"></el-input>
<el-input v-model="form.ycdxbfjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >地下部分建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.scdxbfjzmj" :disabled="form.scyclx==='0'"></el-input>
<el-input v-model="form.scdxbfjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >其它建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycqtjzmj" :disabled="form.scyclx==='1'"></el-input>
<el-input v-model="form.ycqtjzmj" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >其它建筑面积（㎡）</td>
<td colspan="2" align="center" >
<el-input v-model="form.scqtjzmj" :disabled="form.scyclx==='0'"></el-input>
<el-input v-model="form.scqtjzmj" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >分摊系数</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycftxs" :disabled="form.scyclx==='1'"></el-input>
<el-input v-model="form.ycftxs" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊系数</td>
<td colspan="2" align="center" >
<el-input v-model="form.scftxs" :disabled="form.scyclx==='0'"></el-input>
<el-input v-model="form.scftxs" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
......@@ -240,7 +240,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:disabled="disableFlag"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -255,7 +255,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:disabled="disableFlag"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -281,7 +281,7 @@
<span @click="deleteFwjgInfo(index)">删除</span>
</td>
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.fwjgList"
:key="item.bsm"
......@@ -295,15 +295,15 @@
<tr height="30">
<td colspan="2" align="center" >共有土地面积（㎡）</td>
<td colspan="2" >
<el-input v-model="form.gytdmj"></el-input>
<el-input v-model="form.gytdmj" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊土地面积（㎡）</td>
<td colspan="2" >
<el-input v-model="form.fttdmj"></el-input>
<el-input v-model="form.fttdmj" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
<td colspan="2" >
<el-input v-model="form.dytdmj"></el-input>
<el-input v-model="form.dytdmj" :disabled="disableFlag"></el-input>
</td>
</tr>
......@@ -324,29 +324,29 @@
<span>坐落<i class="requisite">*</i></span>
</td>
<td colspan="10" >
<el-input v-model="form.zl"></el-input>
<el-input v-model="form.zl" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >东墙体归属</td>
<td colspan="4" >
<el-input v-model="form.dqtgs"></el-input>
<el-input v-model="form.dqtgs" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >南墙体归属</td>
<td colspan="4" >
<el-input v-model="form.nqtgs"></el-input>
<el-input v-model="form.nqtgs" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >西墙体归属</td>
<td colspan="4" >
<el-input v-model="form.xqtgs"></el-input>
<el-input v-model="form.xqtgs" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >北墙体归属</td>
<td colspan="4" >
<el-input v-model="form.bqtgs"></el-input>
<el-input v-model="form.bqtgs" :disabled="disableFlag"></el-input>
</td>
</tr>
......@@ -355,7 +355,7 @@
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
<el-input v-model="form.bz" type="textarea"></el-input>
<el-input v-model="form.bz" type="textarea" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
......@@ -366,7 +366,7 @@
<span>调查意见</span>
</td>
<td colspan="10" >
<el-input v-model="form.name"></el-input>
<el-input v-model="form.name" :disabled="disableFlag"></el-input>
</td>
</tr>
......@@ -375,7 +375,7 @@
<span>审查员</span>
</td>
<td colspan="2" >
<el-input v-model="form.name"></el-input>
<el-input v-model="form.name" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px">
<span>审查日期</span>
......@@ -391,6 +391,11 @@
</tbody>
</table>
</el-form>
<div class="btnGroup">
<el-button type="primary" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
<!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
......@@ -404,7 +409,7 @@
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz";
import {submit} from "./../../../../../api/common"
import {submit,registerCall} from "./../../../../../api/common"
export default {
name:'zrz',
components:{
......@@ -421,6 +426,8 @@
data () {
return {
disableFlag:false,
//树型结构
show:true,
clearable: true,
......@@ -518,7 +525,24 @@
fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
}
},
created(){
let bsm=this.$store.state.hbsm
console.log(bsm,'户BSM')
this.getHInfo(bsm);
},
methods: {
registerCall(){
let data={
type:'h',
bsm:this.$store.state.hbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......@@ -565,6 +589,9 @@
getQjHDetailByBsm(hbsm).then((res)=>{
if(res.code===200){
this.form = res.result;
if(res.result.qszt !== '0'){
this.disableFlag = true;
}
if(this.form.scyclx==='0'){
this.$set(this.form,"ycjzmj", this.form.jzmj)
this.$set(this.form,"yctnjzmj", this.form.tnjzmj)
......@@ -576,7 +603,7 @@
this.$set(this.form,"sctnjzmj", this.form.gltnjzmj)
this.$set(this.form,"scftjzmj", this.form.glftjzmj)
this.$set(this.form,"scdxbfjzmj", this.form.gldxbfjzmj)
this.$set(this.form,"scqtjzmj", this.form.gltjzmj)
this.$set(this.form,"scqtjzmj", this.form.glqtjzmj)
this.$set(this.form,"scftxs", this.form.glftxs)
}else if(this.form.scyclx==='1'){
this.$set(this.form,"scjzmj", this.form.jzmj)
......@@ -589,7 +616,7 @@
this.$set(this.form,"yctnjzmj", this.form.gltnjzmj)
this.$set(this.form,"ycftjzmj", this.form.glftjzmj)
this.$set(this.form,"ycdxbfjzmj", this.form.gldxbfjzmj)
this.$set(this.form,"ycqtjzmj", this.form.gltjzmj)
this.$set(this.form,"ycqtjzmj", this.form.glqtjzmj)
this.$set(this.form,"ycftxs", this.form.glftxs)
}
......@@ -670,10 +697,8 @@
})
},
//保存户信息
onSave(bsm,yclx){
console.log(bsm);
console.log(yclx)
this.form.bsm=bsm;
onSave(){
this.form.bsm=this.$store.state.hbsm;
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
if(this.form.scyclx==='0'){
this.form.jzmj = this.form.ycjzmj;
......@@ -698,9 +723,9 @@
}
})
},
onSubmit(bsm,yclx){
onSubmit(){
let data={
glbsm:bsm,
glbsm:this.$store.state.hbsm,
status:1,
type:"h"
}
......@@ -813,7 +838,7 @@
watch: {
scyclx:{
handler(n){
this.$nextTick(()=>{
this.$nextTick(()=>{
this.form.scyclx = this.scyclx;
})
}
......@@ -823,7 +848,7 @@
</script>
<style rel="stylesheet/less" lang="less" scoped>
.h {
height: 600px;
height: 100%;
width: 100%;
margin-top: 10px;
overflow-y: scroll;
......@@ -867,11 +892,15 @@
.hTable{
margin-top: 10px;
}
/deep/.el-select-tree{
width: 100%;
.el-input__inner{
height: 30px !important;
}
}
</style>
\ No newline at end of file
.btnGroup{
text-align: center;
margin-top: 20px;
}
</style>
......
......@@ -4,8 +4,8 @@
<el-row class="searchContent">
<el-col :span="6">
<el-radio-group v-model="scyclx" @change="scyclxChange">
<el-radio-button label="1">实测</el-radio-button>
<el-radio-button label="0">预测</el-radio-button>
<el-radio-button label="1">实测</el-radio-button>
</el-radio-group>
<el-input
maxlength="28"
......@@ -257,13 +257,6 @@
<!-- 双击户的弹出框 -->
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -281,7 +274,6 @@ import addZdy from "./zdy/index";
import addCh from "./ch/index";
import hbj from "./hbj/index";
import lpbContent from "./lpbContent/index";
import {registerCall} from "../../../../api/common";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
export default {
......@@ -312,7 +304,7 @@ export default {
plzlVisible: false,
hbjVisible: false,
hcxlzVisible:false,
scyclx: "1", //1是实测 0是预测
scyclx: "0", //1是实测 0是预测
radio1: "",
radio2: "",
createFlag: false,
......@@ -406,18 +398,6 @@ export default {
}, 100);
},
methods: {
registerCall(){
let data={
type:'h',
bsm:this.hbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
batchCommit(){
if (this.bsms.length <= 0) {
Message.warning("请选择操作户")
......@@ -604,18 +584,6 @@ export default {
});
}
},
//户保存
hbjSaveInfo() {
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户保存
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
},
//调用楼盘表信息查询接口
getlpbData() {
this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
......@@ -648,6 +616,7 @@ export default {
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
//给hBsmList传值
// console.log(bsms,'bsms');
this.$refs.lpbContent.choosedList = bsms;
this.$refs.lpbContent.borderColor = color;
})
......
......@@ -681,6 +681,8 @@ export default {
//父组件中选择单元状态改变选中户的边框颜色
choosedList(n) {
this.$refs.hBsm.forEach((item) => {
// console.log(item.dataset.bsm,'item.dataset.bsm');
// console.log(this.choosedList,'this.choosedList');
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
console.log(item.style.borderColor ,'item.style.borderColor ');
......