f6a1dfe4 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents c86881ca 7cea3fc6
......@@ -53,9 +53,9 @@
.el-icon-full-screen{
cursor: pointer;
}
// .el-dialog__wrapper{
// overflow: hidden!important;
// }
.el-dialog__wrapper{
overflow: hidden!important;
}
//table样式
.el-table .even-row {
......
<template>
<div class="main">
<div id="mountNode" ref="containerWidth">
<div v-show="showhide" style="margin: 20px 0 0 20px;color:red;">
<div class="noData" v-show="showhide" style="color:red;">
暂无变更业务,没有历史回溯数据
</div>
</div>
......@@ -406,6 +406,12 @@ export default {
position: relative;
float: left;
/*border: 1px solid red;*/
.noData{
box-sizing: border-box;
padding: 20px;
height: 100%;
width: 100%;
}
}
#mountNodeRight {
......
<template>
<div ref="lpb" class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
......@@ -8,7 +7,6 @@
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
......@@ -70,7 +68,7 @@ export default {
};
</script>
<style scoped lang="less">
.content_box{
padding: 0 0 6px;
.el-tab-pane{
overflow-y: scroll;
}
</style>
......
......@@ -8,17 +8,17 @@
<th colspan="12" align="center" ><font size="4">户基本信息</font></th>
</tr>
<tr height="30">
<td colspan="2" align="center" >宗地代码<i class="requisite">*</i></td>
<td colspan="2" align="center" class="tdright">宗地代码<i class="requisite">*</i></td>
<td colspan="4" >
<el-input v-model="form.zddm" disabled></el-input>
</td>
<td colspan="2" align="center" >自然幢号<i class="requisite">*</i></td>
<td colspan="2" align="center" class="tdright">自然幢号<i class="requisite">*</i></td>
<td colspan="4" >
<el-input v-model="form.zrzh" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
<td colspan="2" align="center" class="tdright">不动产单元号<i class="requisite">*</i></td>
<!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
......@@ -28,7 +28,7 @@
<!-- <td colspan="4" >-->
<!-- <el-input v-model="form.ydybsm" disabled></el-input>-->
<!-- </td>-->
<td colspan="2" align="center" >逻辑幢号</td>
<td colspan="2" align="center" class="tdright">逻辑幢号</td>
<td colspan="4" >
<el-input v-model="form.ljzh" disabled></el-input>
</td>
......@@ -36,7 +36,7 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
<td colspan="2" align="center" class="tdright">房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm">
<el-option
......@@ -48,7 +48,7 @@
</el-select>
</td>
<td colspan="2" align="center" >所在单元</td>
<td colspan="2" align="center" class="tdright">所在单元</td>
<td colspan="4" >
<el-input v-model="form.zdymc" disabled></el-input>
</td>
......@@ -56,12 +56,12 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >层号</td>
<td colspan="2" align="center" class="tdright">层号</td>
<td colspan="4" >
<el-input v-model="form.ch" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >实际层</td>
<td colspan="2" align="center" class="tdright">实际层</td>
<td colspan="4" >
<el-input v-model="form.sjc" disabled></el-input>
</td>
......@@ -69,22 +69,22 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋编号</td>
<td colspan="2" align="center" class="tdright">房屋编号</td>
<td colspan="4" >
<el-input v-model="form.fwbh" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >实际层数</td>
<td colspan="2" align="center" class="tdright">实际层数</td>
<td colspan="4" >
<el-input v-model="form.sjcs" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >室号</td>
<td colspan="2" align="center" class="tdright">室号</td>
<td colspan="4" >
<el-input v-model="form.shbw" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >户号</td>
<td colspan="2" align="center" class="tdright">户号</td>
<td colspan="4" >
<el-input v-model="form.hh" disabled></el-input>
</td>
......@@ -92,7 +92,7 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td>
<td colspan="2" align="center" class="tdright">房屋类型<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwlxbsm" placeholder="请选择" :disabled="disableFlag" ref="fwlxbsm">
<el-option
......@@ -104,7 +104,7 @@
</el-select>
</td>
<td colspan="2" align="center" >名义层</td>
<td colspan="2" align="center" class="tdright">名义层</td>
<td colspan="4" >
<el-input v-model="form.myc" disabled></el-input>
</td>
......@@ -114,7 +114,7 @@
<tr height="30">
<td colspan="2" align="center" >户型</td>
<td colspan="2" align="center" class="tdright">户型</td>
<td colspan="4" >
<el-select v-model="form.hxbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
......@@ -125,7 +125,7 @@
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >户型结构</td>
<td colspan="2" align="center" class="tdright">户型结构</td>
<td colspan="4" >
<el-select v-model="form.hxjgbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
......@@ -139,7 +139,7 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >产别<i class="requisite">*</i></td>
<td colspan="2" align="center" class="tdright">产别<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" :disabled="disableFlag" ref="fwcbbsm">
<el-option
......@@ -150,7 +150,7 @@
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >产权来源<i class="requisite">*</i></td>
<td colspan="2" align="center" class="tdright">产权来源<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" :disabled="disableFlag" ref="fwcqlybsm">
<el-option
......@@ -164,84 +164,84 @@
</tr>
<tr height="30">
<td colspan="2" rowspan="6" align="center" >预测</td>
<td colspan="2" align="center" >建筑面积(㎡)</td>
<td colspan="2" rowspan="6" align="center" class="tdright">预测</td>
<td colspan="2" align="center" class="tdright">建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycjzmj" type="number" :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" rowspan="6" align="center" class="tdright">实测</td>
<td colspan="2" align="center" class="tdright">建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >套内建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">套内建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.yctnjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >套内建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">套内建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.sctnjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >分摊建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">分摊建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycftjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">分摊建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scftjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycdxbfjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scdxbfjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >其它建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">其它建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycqtjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >其它建筑面积(㎡)</td>
<td colspan="2" align="center" class="tdright">其它建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scqtjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >分摊系数</td>
<td colspan="2" align="center" class="tdright">分摊系数</td>
<td colspan="2" align="center" >
<input class="formInput" v-model="form.ycftxs" type="number" :disabled="form.scyclx==='1'||disableFlag" @blur="inputFtxsBlur($event)" ref="ycftxs" />
</td>
<td colspan="2" align="center" >分摊系数</td>
<td colspan="2" align="center" class="tdright">分摊系数</td>
<td colspan="2" align="center" >
<input class="formInput" v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs" />
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >共有土地面积(㎡)</td>
<td colspan="2" align="center" class="tdright">共有土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.gytdmj" type="number" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊土地面积(㎡)</td>
<td colspan="2" align="center" class="tdright">分摊土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.fttdmj" type="number" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >多幢独用土地面积(㎡)</td>
<td colspan="2" align="center" class="tdright">多幢独用土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.dytdmj" type="number" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr>
<td colspan="2" align="center" >
<td colspan="2" align="center" class="tdright">
<span>坐落<i class="requisite">*</i></span>
</td>
<td colspan="10" >
......@@ -250,7 +250,7 @@
</tr>
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" class="tdright" id="ytTitle">
<el-button
type="primary"
style="margin-right: 10px"
......@@ -261,7 +261,7 @@
<span>房屋用途<i class="requisite">*</i></span>
</td>
<td width="30" colspan="2" align="center" >
<td width="30" colspan="2" align="center" class="tdright">
<el-button
type="primary"
class="changeBtn addMinus inMinus"
......@@ -286,8 +286,8 @@
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="2" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<td width="30" colspan="2" align="center" class="tdright">用途</td>
<td width="30" colspan="4" align="center">
<el-select-tree
ref="yt"
v-if="show"
......@@ -305,7 +305,7 @@
</tr>
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright">
<!-- <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> -->
<el-button
type="primary"
......@@ -316,7 +316,7 @@
>
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="2" align="center" >
<td colspan="2" align="center" class="tdright">
<el-button
type="primary"
style="margin-right: 5px"
......@@ -350,29 +350,29 @@
<tr></tr>
<tr height="30">
<td colspan="2" align="center" >东墙体归属</td>
<td colspan="2" align="center" class="tdright">东墙体归属</td>
<td colspan="4" >
<el-input v-model="form.dqtgs" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >南墙体归属</td>
<td colspan="2" align="center" class="tdright">南墙体归属</td>
<td colspan="4" >
<el-input v-model="form.nqtgs" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >西墙体归属</td>
<td colspan="2" align="center" class="tdright">西墙体归属</td>
<td colspan="4" >
<el-input v-model="form.xqtgs" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >北墙体归属</td>
<td colspan="2" align="center" class="tdright">北墙体归属</td>
<td colspan="4" >
<el-input v-model="form.bqtgs" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" rowspan="2" align="center" >
<td colspan="2" rowspan="2" align="center" class="tdright">
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
......@@ -383,7 +383,7 @@
</tr>
<tr height="30">
<td colspan="2" rowspan="2" align="center" >
<td colspan="2" rowspan="2" align="center" class="tdright">
<span>调查意见</span>
</td>
<td colspan="10" >
......@@ -392,13 +392,13 @@
</tr>
<tr height="30">
<td colspan="4" rowspan="2" align="right" style="width:8.33%;padding-right:10px">
<td colspan="4" rowspan="2" align="right" class="tdright" style="width:8.33%;padding-right:10px">
<span>审查员</span>
</td>
<td colspan="2" >
<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">
<td colspan="2" rowspan="2" align="right" class="tdright" style="width:8.33%;padding-right:10px">
<span>审查日期</span>
</td>
<td colspan="2" >
......@@ -416,7 +416,6 @@
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disableFlag">保存</el-button>
<el-button type="primary" @click="onSubmit" :disabled="disableFlag">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
</div>
......@@ -441,10 +440,10 @@
type: String,
default: "1",
},
lpbParent:{
type: String,
default: "",
},
// lpbParent:{
// type: String,
// default: "",
// },
},
data () {
return {
......@@ -554,14 +553,14 @@
}
},
created(){
let bsm=this.bsm;
// let bsm=this.bsm;
if (bsm) {
this.getHInfo(bsm);
if (this.bsm) {
this.getHInfo(this.bsm);
}
this.$nextTick(()=>{
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 230
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 260
})
},
methods: {
......@@ -593,7 +592,7 @@
if (res.success) {
this.$message.success("登记成功")
// if(this.lpbParent === 'isLpb'){
this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
lpbContent.loadingData(this.form.zrzbsm,this.form.scyclx);
// }
this.getTreeByBsm(this.$store.state.zdbsm,'h','0,1,2')
}
......@@ -937,10 +936,10 @@
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成!");
console.log(this.lpbParent,"this.lpbparent")
if(this.lpbParent === 'isLpb'){
this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
}
// console.log(this.lpbParent,"this.lpbparent")
// if(this.lpbParent === 'isLpb'){
lpbContent.loadingData(this.form.zrzbsm,this.form.scyclx);
// }
}else {
this.$message.warning(res.message)
}
......@@ -1167,7 +1166,6 @@
width:8.33%;
height: 36px;
text-align: right;
padding-right: 10px;
}
.el-select{
......
<template>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="户基本信息表" name="hjbxx">
<hbj ref="hbj" :bsm="hbsm"></hbj>
</el-tab-pane>
<el-tab-pane label="登记簿" name="djb">
<djb v-if="djbVisible" :style="{'height' : formHeight+'px'}"></djb>
</el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible" ref="fjcl" :style="{'height' : formHeight+'px'}" :is-disabled="isDisabled"></fjcl>
</el-tab-pane>
</el-tabs>
</template>
<script>
import hbj from "../index"
import djb from "../../../../../zd/djb/index";
import fjcl from "../../../../../zd/fjcl/fjcl"
import {queryStatus} from "@api/search"
export default {
name: "index",
components: {
hbj, djb, fjcl
},
data() {
return {
isDisabled:false,
hbsm:this.$store.state.hbsm,
activeName: "hjbxx",
djbVisible: false,
fjclVisible: false,
formHeight:0,
}
},
mounted() {
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 260
},
methods: {
loadingStatus() {
debugger
let bsm=this.$store.state.hbsm;
queryStatus(bsm).then(res => {
if (res.success) {
let qszt = res.result.qszt;
this.isDisabled = +qszt !== 0;
}
})
},
handleClick(tab, event) {
this.loadingStatus()
// 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 lang="less">
.el-tabs{
/deep/.el-tabs__nav-scroll{
margin-left: -35px;
}
}
</style>
......@@ -85,6 +85,13 @@
@click="batchDelete"
><i class="iconfont iconhuzhongxinlazong"></i>批量删除</el-button
>
<el-button
class="radioBtn"
label="7"
border
@click="batchUpload"
><i class="iconfont iconhuzhongxinlazong"></i>批量上传</el-button
>
</div>
</el-col>
</el-row>
......@@ -139,6 +146,13 @@
>
<span>房屋用途</span>
</div>
<div
:class="selectedZt == 'qsx' ? 'qsx selectedZt' : 'qsx'"
@click="selectedZt = 'qsx'"
>
<span>缺失项</span>
</div>
</div>
<div
class="legendTable-wrap"
......@@ -230,6 +244,34 @@
<td colspan="3" class="tac">暂无数据</td>
</tr>
</table>
<table
class="legendTable"
v-show="selectedZt == 'qsx'"
cellspacing="1"
cellpadding="1"
border="1"
>
<tr>
<th>数据缺失项</th>
<th>套数</th>
</tr>
<tr
v-for="(item, index) in fwytList"
:key="index"
class="cp"
@click="handleChoosedH(item.bsms,item.color)"
>
<td>
<i class="fa fa-circle" :style="{ color: item.color }"></i
>{{ item.name }}
</td>
<td>{{ item.ts }}</td>
</tr>
<tr v-show="fwytList.length < 1">
<td colspan="3" class="tac">暂无数据</td>
</tr>
</table>
</div>
</div>
</div>
......@@ -957,12 +999,14 @@ export default {
}
.dyzt,
.fwxz,
.fwyt {
.fwyt,
.qsx {
height: 122px;
}
.dyzt,
.fwxz,
.fwyt {
.fwyt,
.qsx {
cursor: pointer;
border-bottom: 1px solid #e6e6e6;
border-left: 1px solid #e6e6e6;
......
......@@ -394,7 +394,7 @@ import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
import { hhb,hfg } from "@api/h";
import { Message } from 'element-ui';
import { fwsxbgbl } from "@api/common";
import hbj from "../hbj/index";
import hbj from "../hbj/lpb-hbj/index";
export default {
name: "",
components: { moveH,hbj,HCxlz, },
......@@ -479,6 +479,7 @@ export default {
this.$refs.lpbContent.clientHeight -
6;
}, 200);
window.lpbContent = this;
},
methods: {
loadingData(zrzbsm,scyclx) {
......@@ -688,10 +689,10 @@ export default {
dbclick(bsm) {
clearTimeout(this.time);
this.hbsm = bsm;
this.$store.state.hbsm=this.data;
this.$store.state.hbsm=bsm;
this.hbjVisible = true;
this.$nextTick(function() {
this.$refs.hbj.getHInfo(this.hbsm);
this.$refs.hbj.$refs.hbj.getHInfo(this.hbsm);
});
// if (this.isHbfg) {
......@@ -1383,5 +1384,10 @@ export default {
top: 1px;
}
}
.hbjDialog{
/deep/.el-dialog{
margin-top: 10vh!important;
}
}
}
</style>
......
......@@ -676,6 +676,14 @@
}
vm.rollback(data);
},
//宗地审核流程退回
thzd(){
let data = {
"targetNodeId": this.workFlowData.rollbackDetails[0].id,
"workitemInstanceId": this.$route.query.workitemInstanceId
}
vm.rollback(data);
},
//宗地流程终止
lczz(){
vm.termProcess(this.workFlowData.processInstance.id);
......@@ -947,7 +955,7 @@
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
height: auto!important;
.iconfont{
cursor: pointer;
}
......