Merge remote-tracking branch 'origin/master'

@@ -22,6 +22,20 @@ export function insertQjZdjbxx(data) {
 		data: data,
 		data: data,
 	});
 	});
 }
 }
+
+/**
+ * 新增宗地基本信息
+ */
+export function getBdcdyh (dpdm,dptype) {
+    return request({
+        url: '/system/generator/getBdcdyh',
+        method: 'get',
+        params:{
+            dpdm:dpdm,
+            dptype:dptype
+        }
+    })
+}
 /**
 /**
  * 查询界址点
  * 查询界址点
  */
  */

@@ -69,13 +69,13 @@ const constantRoutes = [
 				path: "/dz",
 				path: "/dz",
 				name: "多幢",
 				name: "多幢",
 				code: "1-2",
 				code: "1-2",
-				component: () => import("@/views/basic/dz/index"),
+				component: () => import("@/views/systemDZ/index"),
 			},
 			},
 			{
 			{
 				path: "/h",
 				path: "/h",
 				name: "户",
 				name: "户",
 				code: "1-3",
 				code: "1-3",
-				component: () => import("@/views/basic/h/index"),
+				component: () => import("@/views/systemH/index"),
 			},
 			},
 			{
 			{
 				path: "/zd",
 				path: "/zd",

+<template>
+    <div class="content_box">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="自然幢信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script>
+    import dzxx from "./dzxx";
+    export default {
+        name: "",
+        components: {
+            dzxx
+        },
+        props: {},
+        data() {
+            return {
+                activeName: "dzxx",
+            };
+        },
+        methods: {
+            handleClick(tab, event) {
+                console.log(tab, event);
+            },
+        },
+        created() {},
+        mounted() {},
+        computed: {},
+        watch: {},
+    };
+</script>
+<style scoped lang="less"></style>

+<template>
+    <div class="content_box">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="自然幢信息" name="hxx"><hxx></hxx></el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script>
+    import hxx from "./hxx";
+    export default {
+        name: "",
+        components: {
+            hxx
+        },
+        props: {},
+        data() {
+            return {
+                activeName: "hxx",
+            };
+        },
+        methods: {
+            handleClick(tab, event) {
+                console.log(tab, event);
+            },
+        },
+        created() {},
+        mounted() {},
+        computed: {},
+        watch: {},
+    };
+</script>
+<style scoped lang="less"></style>

@@ -79,7 +79,7 @@
 							class="formInput percent78"
 							class="formInput percent78"
 							v-model="formData.zddm"
 							v-model="formData.zddm"
 						/>
 						/>
-						<el-button type="primary" class="createBtn">生成</el-button>
+						<el-button type="primary" class="createBtn" @click="generatorCode">生成</el-button>
 					</td>
 					</td>
 				</tr>
 				</tr>
 				<tr>
 				<tr>
@@ -271,6 +271,7 @@
 import Qlr from "../../../components/formMenu/qlr";
 import Qlr from "../../../components/formMenu/qlr";
 import Qlxz from "../../../components/formMenu/qlxz";
 import Qlxz from "../../../components/formMenu/qlxz";
 import { getDdicByMC } from "../../../api/common";
 import { getDdicByMC } from "../../../api/common";
+import { getBdcdyh } from "../../../api/zd";
 export default {
 export default {
 	name: "",
 	name: "",
 	components: {
 	components: {
@@ -329,6 +330,16 @@ export default {
 	},
 	},
 	mounted() {},
 	mounted() {},
 	methods: {
 	methods: {
+
+		generatorCode(){
+			getBdcdyh("860101555888GB","zd")
+					.then((res)=>{
+						console.log(res)
+						this.formData.zddm=res.message.substring(0,19);
+						this.formData.bdcdyh=res.message;
+					})
+		},
+
 		getQlrxxData() {
 		getQlrxxData() {
 			console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
 			console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
 			console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据
 			console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据