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>
......@@ -402,10 +402,16 @@ export default {
width: 60%;
height: calc(100% - 10px);
border: 1px solid #e6e6e6;
background: white;
position: relative;
background: white;
position: relative;
float: left;
/*border: 1px solid red;*/
.noData{
box-sizing: border-box;
padding: 20px;
height: 100%;
width: 100%;
}
}
#mountNodeRight {
......@@ -413,8 +419,8 @@ export default {
float: right;
height: calc(100% - 8px)!important;
border: 1px solid #e6e6e6;
background: white;
box-sizing: border-box;
background: white;
box-sizing: border-box;
// padding: 20px 20px 0 20px;
}
......
<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>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
<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>
<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>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
<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>
</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>
......
<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);
......@@ -945,9 +953,9 @@
</script>
<style rel="stylesheet/less" lang="less" scoped>
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
box-sizing: border-box;
padding: 18px;
height: auto!important;
.iconfont{
cursor: pointer;
}
......