Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -53,9 +53,9 @@
   .el-icon-full-screen{
   .el-icon-full-screen{
     cursor: pointer;
     cursor: pointer;
   }
   }
-  // .el-dialog__wrapper{
-  //   overflow: hidden!important;
-  // }
+  .el-dialog__wrapper{
+    overflow: hidden!important;
+  }
 
 
   //table样式
   //table样式
   .el-table .even-row {
   .el-table .even-row {

+<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>

@@ -394,7 +394,7 @@ import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
 import { hhb,hfg } from "@api/h";
 import { hhb,hfg } from "@api/h";
 import { Message } from 'element-ui';
 import { Message } from 'element-ui';
 import { fwsxbgbl } from "@api/common";
 import { fwsxbgbl } from "@api/common";
-import hbj from "../hbj/index";
+import hbj from "../hbj/lpb-hbj/index";
 export default {
 export default {
 	name: "",
 	name: "",
 	components: { moveH,hbj,HCxlz, },
 	components: { moveH,hbj,HCxlz, },
@@ -479,6 +479,7 @@ export default {
 				this.$refs.lpbContent.clientHeight -
 				this.$refs.lpbContent.clientHeight -
 				6;
 				6;
 		}, 200);
 		}, 200);
+		window.lpbContent = this;
 	},
 	},
 	methods: {
 	methods: {
 		loadingData(zrzbsm,scyclx) {
 		loadingData(zrzbsm,scyclx) {
@@ -688,10 +689,10 @@ export default {
 		dbclick(bsm) {
 		dbclick(bsm) {
 			clearTimeout(this.time);
 			clearTimeout(this.time);
 			this.hbsm = bsm;
 			this.hbsm = bsm;
-			this.$store.state.hbsm=this.data;
+			this.$store.state.hbsm=bsm;
 			this.hbjVisible = true;
 			this.hbjVisible = true;
 			this.$nextTick(function() {
 			this.$nextTick(function() {
-				this.$refs.hbj.getHInfo(this.hbsm);
+				this.$refs.hbj.$refs.hbj.getHInfo(this.hbsm);
 			});
 			});
 			// if (this.isHbfg) {
 			// if (this.isHbfg) {
 
 
@@ -1383,5 +1384,10 @@ export default {
 			top: 1px;
 			top: 1px;
 		}
 		}
 	}
 	}
+	.hbjDialog{
+		/deep/.el-dialog{
+			margin-top: 10vh!important;
+		}
+	}
 }
 }
 </style>
 </style>