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

# Conflicts:
#	src/components/lineTree/lineItem.vue
#	src/components/lineTree/lineTree.vue

@@ -12,6 +12,7 @@
     "lint": "vue-cli-service lint"
     "lint": "vue-cli-service lint"
   },
   },
   "dependencies": {
   "dependencies": {
+    "@antv/g6": "^4.0.2",
     "axios": "^0.19.0",
     "axios": "^0.19.0",
     "core-js": "^2.6.5",
     "core-js": "^2.6.5",
     "e-icon-picker": "^1.0.7",
     "e-icon-picker": "^1.0.7",
@@ -20,6 +21,7 @@
     "element-ui": "^2.13.2",
     "element-ui": "^2.13.2",
     "file-saver": "^2.0.2",
     "file-saver": "^2.0.2",
     "form-making": "^1.2.9",
     "form-making": "^1.2.9",
+    "insert-css": "^2.0.0",
     "js-cookie": "^2.2.1",
     "js-cookie": "^2.2.1",
     "mockjs": "^1.1.0",
     "mockjs": "^1.1.0",
     "screenfull": "^5.0.2",
     "screenfull": "^5.0.2",

+import request from "@/plugin/axios";
+
+/**
+ * 历史回溯
+ * @param data
+ * @constructor
+ */
+export function getLshs(data) {
+    return request({
+        url: "/bg/fwsxbg/lshs",
+        method: "post",
+        data: data,
+    });
+}
+

@@ -44,13 +44,13 @@ export function insertChInfo (data) {
 /**
 /**
  * 查询楼盘表数据
  * 查询楼盘表数据
  */
  */
-export function getLpb (data) {
+export function getLpb (data,lx) {
     return request({
     return request({
         url: 'fw/lpb/getLpb',
         url: 'fw/lpb/getLpb',
         method: 'get',
         method: 'get',
         params: {
         params: {
             zrzbsm:data,
             zrzbsm:data,
-            syclx:0,
+            scyclx:lx,
         },
         },
     })
     })
 }
 }
@@ -73,7 +73,7 @@ export function batchScYcChange (data) {
  */
  */
 export function getLpbTj (data) {
 export function getLpbTj (data) {
     return request({
     return request({
-        url: 'fw/lpb/getLpbTj?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx,
+        url: 'fw/lpb/getLpbTj?zrzbsm='+data.zrzbsm+'&scyclx='+data.scyclx,
         method: 'get',
         method: 'get',
         data:data
         data:data
     })
     })
@@ -102,8 +102,46 @@ export function batchGeneratorBdcdyh (dpdm,zrzbsm) {
  */
  */
 export function getLpbFwytAndQlxz (data) {
 export function getLpbFwytAndQlxz (data) {
     return request({
     return request({
-        url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx,
+        url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&scyclx='+data.scyclx,
         method: 'get',
         method: 'get',
         data:data
         data:data
     })
     })
 }
 }
+/**
+ * 楼盘表 添加层
+// "cbsm": "63147d2d9766db01ead0cd53f23de908",//层标识码
+// "hcount": 3,//添加户数
+// "scyclx": "1",//实测预测类型
+// "sjc": 4//当前的层的SJC ± 1
+ */
+export function insertUpDownC (data) {
+    return request({
+        url: 'fw/lpbright/insertUpDownC',
+        method: 'post',
+        data:data
+    })
+}
+
+/**
+ * 楼盘表 删除层
+ *"bsm": "c0818d9e4286b35b8ee9b96d90b522aa",
+ *"scyclx": "1"
+ */
+export function deleteCByBsm (data) {
+    return request({
+        url: '/fw/lpbright/deleteCByBsm',
+        method: 'delete',
+        data:data
+    })
+}
+/**
+ * 上下左右移动户
+ * @param data
+ */
+export function moveH(data) {
+    return request({
+        url:'fw/lpbright/insertMoveH',
+        method:'post',
+        data:data
+    })
+}

@@ -9,3 +9,11 @@ export function getSearchList(data) {
         data : data,
         data : data,
     })
     })
 }
 }
+
+export function zdlist(data) {
+    return request({
+        url: '/zd/qjZdjbxx/zdlist',
+        method: 'post',
+        data:data
+    })
+}

@@ -40,6 +40,9 @@ table{
 table,td,tr,.el-col,.title{
 table,td,tr,.el-col,.title{
     border-color: #E6E6E6 !important;
     border-color: #E6E6E6 !important;
 }
 }
+.el-table th{
+    background-color: #FBFBFB;
+}
 .formInput {
 .formInput {
     height: 100%;
     height: 100%;
     width: 100%;
     width: 100%;
@@ -54,6 +57,7 @@ table,td,tr,.el-col,.title{
 }
 }
 input:disabled{
 input:disabled{
     cursor: not-allowed;
     cursor: not-allowed;
+    background-color: #F5F7FA;
 }
 }
 .formInput:focus{
 .formInput:focus{
     border: 1px solid #A0C5F6!important;
     border: 1px solid #A0C5F6!important;
@@ -146,14 +150,69 @@ ol, ul { list-style:none; }
 	font-weight: 400;
 	font-weight: 400;
 	color: #333;
 	color: #333;
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
-}
-.contextmenu li {
+    li {
         margin: 0;
         margin: 0;
         padding: 7px 16px;
         padding: 7px 16px;
         cursor: pointer;
         cursor: pointer;
-}
-
-.contextmenu li:hover {
+    }
+    li:hover {
         background: #eee;
         background: #eee;
+    }
+    .noEdit{
+        color: #E6E6E6;
+        cursor: not-allowed;
+    }
+    .noEdit:hover{
+        background: #ffffff;
+    }
 }
 }
 // end
 // end
+//生成按钮样式
+.el-button--warning{
+    color: #FFF;
+    background-color: #F79700;
+    border-color: #F79700;
+}
+.el-button--warning:focus, .el-button--warning:hover{
+    background-color: rgba(247, 151, 0,.7);
+    border-color: rgba(247, 151, 0,.7);
+}
+.percent80{
+    width: 78%;
+    float: left;
+}
+.createBtn{
+    position: absolute;
+    width: 50px;
+    padding: 6px 0px;
+    right: 6px;
+    top: 4px;
+}
+// 增删操作按钮样式
+.addMinus{
+    border-radius:50%;
+    width: 30px !important;
+    height: 30px !important;
+    font-size: 22px!important;
+    padding: 4px 6px;
+}
+.outAdd,.outAdd:hover:focus{
+    background-color: #2FA5FF!important;
+    border: 1px solid #2FA5FF!important;
+    color: #fff!important;
+}
+.inAdd,.inAdd:hover:focus{
+    border: 1px solid #2FA5FF!important;
+    background-color: #fff!important;
+    color: #2FA5FF!important;
+}
+.outMinus,.outMinus:hover:focus{
+    background-color: #FA6400!important;
+    border: 1px solid #FA6400!important;
+    color: #fff!important;
+}
+.inMinus,.inMinus:hover:focus{
+    border: 1px solid #FA6400!important;
+    background-color: #fff!important;
+    color: #FA6400!important;
+}
\ No newline at end of file

@@ -91,7 +91,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-    import {getSearchList} from './../../api/search'
+    import {zdlist} from './../../api/search'
     import {zrzcxlz} from './../../api/h'
     import {zrzcxlz} from './../../api/h'
     import {Message} from 'element-ui'
     import {Message} from 'element-ui'
 
 
@@ -103,9 +103,8 @@
                 queryData: {
                 queryData: {
                     bdcdyh: "",
                     bdcdyh: "",
                     bdcqzh: "",
                     bdcqzh: "",
-                    dylxs: ['zd'],
                     qlrmc: "",
                     qlrmc: "",
-                    qszt: "2",
+                    qszt: ["2"],
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
                     zl: "",
                     zl: "",
@@ -141,7 +140,7 @@
         },
         },
         methods: {
         methods: {
             saveNotarize: function (val) {
             saveNotarize: function (val) {
-                this.zdbsm = val.glbsm;
+                this.zdbsm = val.zdbsm;
                 this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
                 this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
                     confirmButtonText: '确定',
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     cancelButtonText: '取消',
@@ -176,7 +175,7 @@
                     bdcdyh: "",
                     bdcdyh: "",
                     bdcqzh: "",
                     bdcqzh: "",
                     qlrmc: "",
                     qlrmc: "",
-                    qszt: "2",
+                    qszt: ["2"],
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
                     zl: "",
                     zl: "",
@@ -186,8 +185,7 @@
                 this.getData(this.queryData)
                 this.getData(this.queryData)
             },
             },
             getData: function (data) {
             getData: function (data) {
-                data['dylxs'] = this.dylxs;
-                getSearchList(data).then(res => {
+                zdlist(data).then(res => {
                     this.Data = res.result.records
                     this.Data = res.result.records
                     this.total = res.result.total;
                     this.total = res.result.total;
                 })
                 })

@@ -210,13 +210,13 @@
 							<td rowspan="2" class="btnCol">
 							<td rowspan="2" class="btnCol">
 								<el-button
 								<el-button
 									type="primary"
 									type="primary"
-									class="changeBtn"
+									class="changeBtn outAdd addMinus"
 									@click="handleClick(item, index, 'add')"
 									@click="handleClick(item, index, 'add')"
 									>+</el-button
 									>+</el-button
 								>
 								>
 								<el-button
 								<el-button
 									type="primary"
 									type="primary"
-									class="changeBtn"
+									class="changeBtn outMinus addMinus"
 									@click="handleClick(item, index, 'minus')"
 									@click="handleClick(item, index, 'minus')"
 									>-</el-button
 									>-</el-button
 								>
 								>
@@ -671,10 +671,6 @@
             text-align: center;
             text-align: center;
             cursor: text;
             cursor: text;
         }
         }
-        .percent78 {
-            width: 78%;
-            float: left;
-        }
         .percent68 {
         .percent68 {
             width: 68% !important;
             width: 68% !important;
             float: left;
             float: left;
@@ -685,13 +681,6 @@
             width: 30% !important;
             width: 30% !important;
             float: left;
             float: left;
         }
         }
-        .createBtn {
-            position: absolute;
-            width: 50px;
-            padding: 6px 4px;
-            right: 4px;
-            top: 4px;
-        }
         .el-input__icon {
         .el-input__icon {
             line-height: 37px;
             line-height: 37px;
         }
         }

@@ -15,14 +15,14 @@
 					<el-button
 					<el-button
 						v-show="childIndex < 1"
 						v-show="childIndex < 1"
 						type="primary"
 						type="primary"
-						class="changeBtn"
+						class="changeBtn addMinus outAdd"
 						@click="handleClick(index, 'add')"
 						@click="handleClick(index, 'add')"
 						>+</el-button
 						>+</el-button
 					>
 					>
 					<el-button
 					<el-button
 						v-show="childIndex < 1"
 						v-show="childIndex < 1"
 						type="primary"
 						type="primary"
-						class="changeBtn"
+						class="changeBtn addMinus outMinus"
 						@click="handleClick(index, 'minus')"
 						@click="handleClick(index, 'minus')"
 						>-</el-button
 						>-</el-button
 					>
 					>
@@ -41,13 +41,13 @@
 					<span class="qlxz" v-show="childIndex < 1">权利性质</span><br />
 					<span class="qlxz" v-show="childIndex < 1">权利性质</span><br />
 					<el-button
 					<el-button
 						type="primary"
 						type="primary"
-						class="changeBtn"
+						class="changeBtn addMinus inAdd"
 						@click="handleInClick(index, childIndex, 'add')"
 						@click="handleInClick(index, childIndex, 'add')"
 						>+</el-button
 						>+</el-button
 					>
 					>
 					<el-button
 					<el-button
 						type="primary"
 						type="primary"
-						class="changeBtn"
+						class="changeBtn addMinus inMinus"
 						@click="handleInClick(index, childIndex, 'minus')"
 						@click="handleInClick(index, childIndex, 'minus')"
 						>-</el-button
 						>-</el-button
 					>
 					>
@@ -132,6 +132,7 @@
 						<li>
 						<li>
 							<input
 							<input
 								type="text"
 								type="text"
+								style="top: -1px;"
 								:disabled="formData.qszt!='0'"
 								:disabled="formData.qszt!='0'"
 								placeholder="请输入"
 								placeholder="请输入"
 								v-model="childItem.pzytdm"
 								v-model="childItem.pzytdm"
@@ -398,7 +399,7 @@ export default {
 	.qlxzModule {
 	.qlxzModule {
 		height: auto;
 		height: auto;
 		position: relative;
 		position: relative;
-		border-bottom: 1px solid grey;
+		border-bottom: 1px solid #E6E6E6;
 		.el-col {
 		.el-col {
 			// height: 100%;
 			// height: 100%;
 			border-right: 1px solid grey;
 			border-right: 1px solid grey;
@@ -422,6 +423,8 @@ export default {
 					input {
 					input {
 						position: relative;
 						position: relative;
 						top: -2px;
 						top: -2px;
+						height: 35px;
+						width: calc(100% - 1px) !important;
 					}
 					}
 					.el-input__inner {
 					.el-input__inner {
 						height: 34px;
 						height: 34px;

@@ -5,20 +5,25 @@
 			v-for="(items, index) in countList"
 			v-for="(items, index) in countList"
 			:key="items.id"
 			:key="items.id"
 		>
 		>
-			<template v-for="(childItem,childIndex) in items.list" >
-				<el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''">
+			<template v-for="(childItem, childIndex) in items.list">
+				<el-col
+					:span="2"
+					class="btnCol"
+					:key="childIndex + '1'"
+					:class="childIndex > 0 ? 'childYT noTopBorder' : ''"
+				>
 					<el-button
 					<el-button
-						v-show="childIndex<1"
+						v-show="childIndex < 1"
 						type="primary"
 						type="primary"
-						class="changeBtn"
-						@click="handleClick( index, 'add')"
+						class="changeBtn addMinus outAdd"
+						@click="handleClick(index, 'add')"
 						>+</el-button
 						>+</el-button
 					>
 					>
 					<el-button
 					<el-button
-						v-show="childIndex<1"
+						v-show="childIndex < 1"
 						type="primary"
 						type="primary"
-						class="changeBtn"
-						@click="handleClick( index, 'minus')"
+						class="changeBtn addMinus outMinus"
+						@click="handleClick(index, 'minus')"
 						>-</el-button
 						>-</el-button
 					>
 					>
 					<div
 					<div
@@ -26,31 +31,44 @@
 						v-if="items.isInside"
 						v-if="items.isInside"
 					></div>
 					></div>
 				</el-col>
 				</el-col>
-				<el-col :span="2" class="btnCol" :key="childIndex+'8'" :class="childIndex>0 ? 'childYT':''">
+				<el-col
+					:span="2"
+					class="btnCol"
+					:key="childIndex + '8'"
+					:class="childIndex > 0 ? 'childYT' : ''"
+				>
 					<!-- <template v-if="childIndex>0"> -->
 					<!-- <template v-if="childIndex>0"> -->
-						<span class="qlxz"  v-show="childIndex<1">权利性质</span><br>
+					<span class="qlxz" v-show="childIndex < 1">权利性质</span><br />
 					<el-button
 					<el-button
 						type="primary"
 						type="primary"
-							class="changeBtn"
+						class="changeBtn addMinus inAdd"
 						@click="handleInClick(index, childIndex, 'add')"
 						@click="handleInClick(index, childIndex, 'add')"
 						>+</el-button
 						>+</el-button
 					>
 					>
 					<el-button
 					<el-button
 						type="primary"
 						type="primary"
-							class="changeBtn"
+						class="changeBtn addMinus inMinus"
 						@click="handleInClick(index, childIndex, 'minus')"
 						@click="handleInClick(index, childIndex, 'minus')"
 						>-</el-button
 						>-</el-button
 					>
 					>
 					<!-- </template> -->
 					<!-- </template> -->
 				</el-col>
 				</el-col>
-				<el-col :span="5" :key="childIndex+'7'" :class="childIndex>0 ? 'childYT':''">
+				<el-col
+					:span="5"
+					:key="childIndex + '7'"
+					:class="childIndex > 0 ? 'childYT' : ''"
+				>
 					<ul>
 					<ul>
 						<li>批准用途</li>
 						<li>批准用途</li>
 						<li>实际用途</li>
 						<li>实际用途</li>
 						<li>土地使用起始时间<i class="requisite">*</i></li>
 						<li>土地使用起始时间<i class="requisite">*</i></li>
 					</ul>
 					</ul>
 				</el-col>
 				</el-col>
-				<el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
+				<el-col
+					:span="5"
+					:key="childIndex + '6'"
+					:class="childIndex > 0 ? 'childYT' : ''"
+				>
 					<ul>
 					<ul>
 						<li>
 						<li>
 							<el-select-tree
 							<el-select-tree
@@ -91,20 +109,39 @@
 						</li>
 						</li>
 					</ul>
 					</ul>
 				</el-col>
 				</el-col>
-				<el-col :span="5" :key="childIndex+'5'" :class="childIndex>0 ? 'childYT':''">
+				<el-col
+					:span="5"
+					:key="childIndex + '5'"
+					:class="childIndex > 0 ? 'childYT' : ''"
+				>
 					<ul>
 					<ul>
 						<li>地类编码</li>
 						<li>地类编码</li>
 						<li>地类编码</li>
 						<li>地类编码</li>
 						<li>土地使用结束时间<i class="requisite">*</i></li>
 						<li>土地使用结束时间<i class="requisite">*</i></li>
 					</ul>
 					</ul>
 				</el-col>
 				</el-col>
-				<el-col :span="5" :key="childIndex+'4'" :class="childIndex>0 ? 'childYT':''">
+				<el-col
+					:span="5"
+					:key="childIndex + '4'"
+					:class="childIndex > 0 ? 'childYT' : ''"
+				>
 					<ul>
 					<ul>
 						<li>
 						<li>
-							<input type="text" placeholder="请输入" v-model="childItem.pzytdm" class="formInput" />
+							<input
+								type="text"
+								style="top: -1px;"
+								placeholder="请输入"
+								v-model="childItem.pzytdm"
+								class="formInput"
+							/>
 						</li>
 						</li>
 						<li>
 						<li>
-							<input type="text" placeholder="请输入" v-model="childItem.sjytdm" class="formInput" />
+							<input
+								type="text"
+								placeholder="请输入"
+								v-model="childItem.sjytdm"
+								class="formInput"
+							/>
 						</li>
 						</li>
 						<li>
 						<li>
 							<el-date-picker
 							<el-date-picker
@@ -146,17 +183,17 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			//树型结构
 			//树型结构
-			show:true,
+			show: true,
 			clearable: true,
 			clearable: true,
 			defaultExpandAll: true,
 			defaultExpandAll: true,
 			multiple: false,
 			multiple: false,
-			placeholder: '请选择',
+			placeholder: "请选择",
 			disabled: false,
 			disabled: false,
 			checkStrictly: true,
 			checkStrictly: true,
 			treeProps: {
 			treeProps: {
-				value: 'dm',
-				children: 'children',
-				label: 'mc'
+				value: "dm",
+				children: "children",
+				label: "mc",
 			},
 			},
 
 
 			countList: [
 			countList: [
@@ -164,97 +201,96 @@ export default {
 					id: Math.random(),
 					id: Math.random(),
 					isInside: false,
 					isInside: false,
 					hasNotBorder: false,
 					hasNotBorder: false,
-					"bsm": "",//权利性质标识码 
-					"glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM 
-					"qlxzdm": "",
-					"zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
-					list:[
+					bsm: "", //权利性质标识码
+					glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
+					qlxzdm: "",
+					zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
+					list: [
 						{
 						{
-							"pzdjbsm": "",
-							"pzdjmc": "",
-							"pzytdm": "",
-							"pzytmc": "",
-							"pzytmj": 0,
-							"qlxzbsm": "",
-							"sjdjbsm": "",
-							"sjdjmc": "",
-							"sjytdm": "",
-							"sjytmc": "",
-							"sjytmj": 0,
-							"syqx": "",
-							"tdsyjssj": "",
-							"tdsyqssj": "",
-							"tdzh": ""
-						}
-					]
+							pzdjbsm: "",
+							pzdjmc: "",
+							pzytdm: "",
+							pzytmc: "",
+							pzytmj: 0,
+							qlxzbsm: "",
+							sjdjbsm: "",
+							sjdjmc: "",
+							sjytdm: "",
+							sjytmc: "",
+							sjytmj: 0,
+							syqx: "",
+							tdsyjssj: "",
+							tdsyqssj: "",
+							tdzh: "",
 						},
 						},
 					],
 					],
-			outNum:0
-		};
 				},
 				},
-	created(){
+			],
+			outNum: 0,
+		};
 	},
 	},
+	created() {},
 	methods: {
 	methods: {
 		//外层操作
 		//外层操作
-		handleClick( ind, type) {
+		handleClick(ind, type) {
 			let outsideObj = {
 			let outsideObj = {
 				id: Math.random(),
 				id: Math.random(),
 				isInside: false,
 				isInside: false,
 				hasNotBorder: false,
 				hasNotBorder: false,
-				"bsm": "",//权利性质标识码 
-				"glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM 
-				"qlxzdm": "",
-				"zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
-				list:[
+				bsm: "", //权利性质标识码
+				glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
+				qlxzdm: "",
+				zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
+				list: [
 					{
 					{
-						"pzdjbsm": "",
-						"pzdjmc": "",
-						"pzytdm": "",
-						"pzytmc": "",
-						"pzytmj": 0,
-						"qlxzbsm": "",
-						"sjdjbsm": "",
-						"sjdjmc": "",
-						"sjytdm": "",
-						"sjytmc": "",
-						"sjytmj": 0,
-						"syqx": "",
-						"tdsyjssj": "",
-						"tdsyqssj": "",
-						"tdzh": ""
-					}
-				]
+						pzdjbsm: "",
+						pzdjmc: "",
+						pzytdm: "",
+						pzytmc: "",
+						pzytmj: 0,
+						qlxzbsm: "",
+						sjdjbsm: "",
+						sjdjmc: "",
+						sjytdm: "",
+						sjytmc: "",
+						sjytmj: 0,
+						syqx: "",
+						tdsyjssj: "",
+						tdsyqssj: "",
+						tdzh: "",
+					},
+				],
 			};
 			};
 			if (type === "add") {
 			if (type === "add") {
 				this.countList.push(outsideObj);
 				this.countList.push(outsideObj);
-				this.outNum++
+				this.outNum++;
 			} else {
 			} else {
 				this.countList.forEach((item, index) => {
 				this.countList.forEach((item, index) => {
 					if (index == ind && this.countList.length > 1) {
 					if (index == ind && this.countList.length > 1) {
 						this.countList.splice(index, 1);
 						this.countList.splice(index, 1);
 					}
 					}
 				});
 				});
-				this.outNum--
+				this.outNum--;
 			}
 			}
 		},
 		},
 		//内层操作
 		//内层操作
 		handleInClick(index, childIndex, type) {
 		handleInClick(index, childIndex, type) {
 			let insideObj = {
 			let insideObj = {
-							"pzdjbsm": "",
-							"pzdjmc": "",
-							"pzytdm": "",
-							"pzytmc": "",
-							"pzytmj": 0,
-							"qlxzbsm": "",
-							"sjdjbsm": "",
-							"sjdjmc": "",
-							"sjytdm": "",
-							"sjytmc": "",
-							"sjytmj": 0,
-							"syqx": "",
-							"tdsyjssj": "",
-							"tdsyqssj": "",
-							"tdzh": ""
+				pzdjbsm: "",
+				pzdjmc: "",
+				pzytdm: "",
+				pzytmc: "",
+				pzytmj: 0,
+				qlxzbsm: "",
+				sjdjbsm: "",
+				sjdjmc: "",
+				sjytdm: "",
+				sjytmc: "",
+				sjytmj: 0,
+				syqx: "",
+				tdsyjssj: "",
+				tdsyqssj: "",
+				tdzh: "",
 			};
 			};
 			if (type === "add") {
 			if (type === "add") {
 				this.countList[index].list.splice(childIndex + 1, 0, insideObj);
 				this.countList[index].list.splice(childIndex + 1, 0, insideObj);
@@ -273,7 +309,8 @@ export default {
 				if (index == this.countList.length - 1) {
 				if (index == this.countList.length - 1) {
 					item.hasNotBorder = true;
 					item.hasNotBorder = true;
 				} else {
 				} else {
-					item.hasNotBorder = item.isInside && !this.countList[index + 1].isInside ? true : false;
+					item.hasNotBorder =
+						item.isInside && !this.countList[index + 1].isInside ? true : false;
 				}
 				}
 			});
 			});
 		},
 		},
@@ -289,7 +326,7 @@ export default {
 	.qlxzModule {
 	.qlxzModule {
 		height: auto;
 		height: auto;
 		position: relative;
 		position: relative;
-		border-bottom: 1px solid grey;
+		border-bottom: 1px solid #e6e6e6;
 		.el-col {
 		.el-col {
 			// height: 100%;
 			// height: 100%;
 			border-right: 1px solid grey;
 			border-right: 1px solid grey;
@@ -303,16 +340,22 @@ export default {
 					height: 37px;
 					height: 37px;
 					line-height: 37px;
 					line-height: 37px;
 					text-decoration: none;
 					text-decoration: none;
-					border-bottom: 1px solid #E6E6E6;
-					.el-select{
+					border-bottom: 1px solid #e6e6e6;
+					.el-select {
 						width: 100%;
 						width: 100%;
 					}
 					}
-					.el-input{
+					.el-input {
 						width: 100%;
 						width: 100%;
 					}
 					}
 					.el-input__inner {
 					.el-input__inner {
 						height: 34px;
 						height: 34px;
 					}
 					}
+					input {
+						position: relative;
+						top: -2px;
+						height: 35px;
+						width: calc(100% - 1px) !important;
+					}
 				}
 				}
 				li:last-child {
 				li:last-child {
 					border-bottom: none;
 					border-bottom: none;
@@ -330,12 +373,12 @@ export default {
 				bottom: 2px;
 				bottom: 2px;
 			}
 			}
 		}
 		}
-		.childYT{
+		.childYT {
 			height: 114px;
 			height: 114px;
 			border-top: 1px solid grey;
 			border-top: 1px solid grey;
 			ul {
 			ul {
 				margin-top: 0;
 				margin-top: 0;
-				li{
+				li {
 					.el-input__inner {
 					.el-input__inner {
 						height: 29px;
 						height: 29px;
 					}
 					}
@@ -348,10 +391,10 @@ export default {
 				margin-top: 4px;
 				margin-top: 4px;
 			}
 			}
 		}
 		}
-		.noTopBorder{
+		.noTopBorder {
 			border-top: 0;
 			border-top: 0;
 		}
 		}
-		.noRightBorder{
+		.noRightBorder {
 			border-right: 0;
 			border-right: 0;
 		}
 		}
 		.el-col:nth-last-child(2) {
 		.el-col:nth-last-child(2) {
@@ -397,5 +440,11 @@ export default {
 	.el-row:nth-last-child(1) {
 	.el-row:nth-last-child(1) {
 		border-bottom: none;
 		border-bottom: none;
 	}
 	}
+	/deep/.el-select-tree {
+		width: 100%;
+		.el-input__inner {
+			height: 30px !important;
+		}
+	}
 }
 }
 </style>
 </style>

@@ -64,19 +64,19 @@
                 <el-button type="primary" @click="save">保存</el-button>
                 <el-button type="primary" @click="save">保存</el-button>
                 <el-button type="primary" @click="cancel">取消</el-button>
                 <el-button type="primary" @click="cancel">取消</el-button>
             </div>
             </div>
-            <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
-                        :isZdClose="true"></query-data>
+            <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
+                        :isZdClose="true"></zd-query-data>
         </el-dialog>
         </el-dialog>
 </template>
 </template>
 
 
 <script>
 <script>
-    import queryData from './../../components/queryData/queryData'
+    import zdQueryData from './../../components/zdQueryData/zdQueryData'
     import {zdXlcd, hzl} from './../../api/zd'
     import {zdXlcd, hzl} from './../../api/zd'
     import {Message} from 'element-ui'
     import {Message} from 'element-ui'
 
 
     export default {
     export default {
         name: "hCxlz",
         name: "hCxlz",
-        components: {queryData},
+        components: {zdQueryData},
         data() {
         data() {
             return {
             return {
                 zd: {},
                 zd: {},

@@ -48,6 +48,9 @@
 						active_color: item.expand,
 						active_color: item.expand,
 					}"
 					}"
 				>
 				>
+					<span v-if="item.qszt=='0'" style="color:red">(临)</span>
+					<span v-if="item.qszt=='1'" style="color:green">(正)</span>
+					<span v-if="item.qszt=='2'" style="color:blue">(现)</span>
 					{{ item.mc }}
 					{{ item.mc }}
 				</div>
 				</div>
 			</div>
 			</div>
@@ -229,6 +232,10 @@ export default {
 	width: 100%;
 	width: 100%;
 	cursor: pointer;
 	cursor: pointer;
 }
 }
+// .ofy_scroll{
+// 	overflow-y: scroll;
+// 	overflow-x: hidden;
+// }
 .basic_layer {
 .basic_layer {
 	width: 100%;
 	width: 100%;
 	position: relative;
 	position: relative;
@@ -261,7 +268,7 @@ export default {
 	position: relative;
 	position: relative;
 	// padding-bottom: 15px;
 	// padding-bottom: 15px;
 	width: 100%;
 	width: 100%;
-	padding-left: 40px;
+	padding-left: 25px;
 }
 }
 .white_layer {
 .white_layer {
 	color: black!important;
 	color: black!important;
@@ -272,19 +279,21 @@ export default {
 	position: absolute;
 	position: absolute;
 	height: 1px;
 	height: 1px;
 	width: 16px;
 	width: 16px;
-	left: 9px;
-	top: 9px;
-	background: url('../../assets/images/rowline.png');
+	left: 8px;
+	top: 8px;
+	opacity: .5;
+	background: url('../../assets/images/rowline1.png');
     background-position-y: center;
     background-position-y: center;
 }
 }
 .third_layer::before {
 .third_layer::before {
 	content: "";
 	content: "";
 	position: absolute;
 	position: absolute;
 	height: 1px;
 	height: 1px;
-	width: 22px;
-	left: 9px;
-	top: 9px;
-	background: url('../../assets/images/rowline.png');
+	width: 16px;
+	left: 8px;
+	top: 8px;
+	opacity: .5;
+	background: url('../../assets/images/rowline1.png');
     background-position-y: center;
     background-position-y: center;
 }
 }
 
 
@@ -295,7 +304,8 @@ export default {
 	width: 1px;
 	width: 1px;
 	left: 7px;
 	left: 7px;
 	top: 0px;
 	top: 0px;
-	background: url('../../assets/images/colline.png');
+	opacity: .5;
+	background: url('../../assets/images/colline1.png');
 	background-position-x: center;
 	background-position-x: center;
 }
 }
 .linkLine_first::after {
 .linkLine_first::after {
@@ -306,18 +316,20 @@ export default {
 	height: calc(100% + 14px);
 	height: calc(100% + 14px);
 	width: 1px;
 	width: 1px;
 	left: 7px;
 	left: 7px;
-	background: url('../../assets/images/colline.png');
+	opacity: .5;
+	background: url('../../assets/images/colline1.png');
 	background-position-x: center;
 	background-position-x: center;
 }
 }
 // 上半截
 // 上半截
 .linkLine_half_top::after {
 .linkLine_half_top::after {
 	content: "";
 	content: "";
 	position: absolute;
 	position: absolute;
-	height: 24px;
+	height: 23px;
 	top: -14px;
 	top: -14px;
 	width: 1px;
 	width: 1px;
 	left: 7px;
 	left: 7px;
-	background: url('../../assets/images/colline.png');
+	opacity: .5;
+	background: url('../../assets/images/colline1.png');
 	background-position-x: center;
 	background-position-x: center;
 }
 }
 .linkLine_last::after {
 .linkLine_last::after {
@@ -327,28 +339,33 @@ export default {
 	width: 1px;
 	width: 1px;
 	left: 7px;
 	left: 7px;
 	top: 0px;
 	top: 0px;
-	background: url('../../assets/images/colline.png');
+	opacity: .5;
+	background: url('../../assets/images/colline1.png');
 	background-position-x: center;
 	background-position-x: center;
 }
 }
 .reTree_collapse_icon {
 .reTree_collapse_icon {
+	// opacity: .5;
 	background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
 	background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
 		center;
 		center;
 	background-size: contain;
 	background-size: contain;
 }
 }
 
 
 .reTree_default_icon {
 .reTree_default_icon {
+	// opacity: .5;
 	background: url("../../assets/images/reTree_default_.svg") no-repeat center
 	background: url("../../assets/images/reTree_default_.svg") no-repeat center
 		center;
 		center;
 	background-size: contain;
 	background-size: contain;
 }
 }
 
 
 .reTree_expand_icon {
 .reTree_expand_icon {
+	// opacity: .5;
 	background: url("../../assets/images/reTree_expand_.svg") no-repeat center
 	background: url("../../assets/images/reTree_expand_.svg") no-repeat center
 		center;
 		center;
 	background-size: contain;
 	background-size: contain;
 }
 }
 
 
 .reTree_focus_icon {
 .reTree_focus_icon {
+	// opacity: .5;
 	background: url("../../assets/images/reTree_focus_.svg") no-repeat center
 	background: url("../../assets/images/reTree_focus_.svg") no-repeat center
 		center;
 		center;
 	background-size: contain;
 	background-size: contain;

@@ -62,7 +62,8 @@
 			<li v-show="isZD">导入属性</li>
 			<li v-show="isZD">导入属性</li>
 			<li v-show="!isZD">导入楼盘</li>
 			<li v-show="!isZD">导入楼盘</li>
 			<li>重叠分析</li>
 			<li>重叠分析</li>
-			<li v-show="isZD" @click="openCreateDialog">添加定着物</li>
+			<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
+			<li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
 			<li @click="deleteByBsm()">删除</li>
 			<li @click="deleteByBsm()">删除</li>
 		</ul>
 		</ul>
 		<ul
 		<ul
@@ -93,7 +94,6 @@
       <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
       <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
     </el-dialog>
     </el-dialog>
 		<!-- 添加定着物弹框 -->
 		<!-- 添加定着物弹框 -->
-
 		<el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
 		<el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
 			<Create @closeDialog="closeDialog" :auth="true"></Create>
 			<Create @closeDialog="closeDialog" :auth="true"></Create>
 		</el-dialog>
 		</el-dialog>
@@ -141,7 +141,9 @@ export default {
 			//控制新建宗地菜单
 			//控制新建宗地菜单
 			createVisible:false,
 			createVisible:false,
 			//多幢
 			//多幢
-			dzVisible:false
+			dzVisible:false,
+			//宗地权属状态
+			zdQszt:null,
 		};
 		};
 	},
 	},
 	watch: {
 	watch: {
@@ -185,7 +187,8 @@ export default {
 			this.visible = data;
 			this.visible = data;
 		},
 		},
 		changeZdData(data) {
 		changeZdData(data) {
-			this.zdData = data
+			this.zdData = data;
+			this.zdQszt = data.qszt;
 		},
 		},
 		changeTop(data) {
 		changeTop(data) {
 			this.top = data;
 			this.top = data;
@@ -310,18 +313,36 @@ export default {
 		},
 		},
 		//右键菜单的删除
 		//右键菜单的删除
 		deleteByBsm(){
 		deleteByBsm(){
-			var self = this;
-			let params={"bsm":this.zdData.bsm,"type":this.zdData.type};
-			if(this.zdData.type=='zd'){
-				params={"bsm":this.zdData.zdbsm,"type":this.zdData.type};
+			let name='';
+			switch (this.zdData.type) {
+				case 'zd':
+					name = '宗地'
+					break;
+				case 'dz':
+					name = '多幢'
+					break;
+				case 'zrz':
+					name = '自然幢'
+					break;
+
+				default:
+					break;
 			}
 			}
+			 this.$confirm('是否确定删除该'+name+'?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let params={"bsm":this.zdData.bsm,"type":this.zdData.type};
 				deleteZdInfoByBsm(params)
 				deleteZdInfoByBsm(params)
 					.then((res) => {
 					.then((res) => {
-					if(res.code=200){
+						console.log(res);
+						if(res.success){
 							this.$message({
 							this.$message({
-							message: res.message,
-							type: "success",
+								type: 'success',
+								message: '删除成功!'
 							});
 							});
+							this.$router.push("/panel");
 						} else {
 						} else {
 							this.$message({
 							this.$message({
 								message: res.message,
 								message: res.message,
@@ -330,6 +351,17 @@ export default {
 						}
 						}
 					})
 					})
 					.catch((error) => {});
 					.catch((error) => {});
+			}).catch(() => {
+
+			});
+            var self = this;
+            var BSM = "";
+            var type = this.zdData.type;
+            if(type == "zd"){
+                BSM = this.zdData.zdbsm;
+            }else {
+                BSM = this.zdData.bsm;
+            }
             //删除图形相关信息
             //删除图形相关信息
             var type = this.zdData.type;
             var type = this.zdData.type;
             this.queryGeoByBsm(BSM,type,function (features){
             this.queryGeoByBsm(BSM,type,function (features){
@@ -475,7 +507,6 @@ export default {
 	position: relative;
 	position: relative;
 	color: #ffffff;
 	color: #ffffff;
 	cursor: pointer;
 	cursor: pointer;
-	moz-user-select: -moz-none;
 	-moz-user-select: none;
 	-moz-user-select: none;
 	-o-user-select: none;
 	-o-user-select: none;
 	-khtml-user-select: none;
 	-khtml-user-select: none;

+<template>
+    <div>
+        <el-dialog
+                title="移动户"
+                :visible.sync="isVisible"
+                width="50%"
+                @close="close"
+                :modal-append-to-body="false"
+                center>
+            <div>
+                <div class="bottom-radio">
+                    <el-radio-group v-model="moveHdata.sxzylx">
+                        <el-radio label="up">向上</el-radio>
+                        <el-radio label="down">向下</el-radio>
+                        <el-radio label="left">向左</el-radio>
+                        <el-radio label="right">向右</el-radio>
+                    </el-radio-group>
+                </div>
+                <div class="bottom-buttom">
+                    <el-button type="primary" @click="save">确认</el-button>
+                    <el-button type="primary" @click="cacel">取消</el-button>
+                </div>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import {moveH} from './../../api/lpb'
+    import {Message} from 'element-ui'
+
+    export default {
+        name: "moveH",
+        data() {
+            return {
+                isVisible: false,
+                moveHdata: {
+                    hbsm: "",
+                    sxzylx: "",
+                    type: ""
+                }
+            }
+        },
+        props: {
+            moveHvisible: {
+                type: Boolean,
+                default: false
+            },
+            hbsm: {
+                type: String
+            },
+            type: {
+                type: String
+            }
+        },
+        methods: {
+            loading: function () {
+                this.$emit('loading')
+            },
+            save() {
+                this.moveHdata.hbsm = this.hbsm
+                this.moveHdata.type = this.type
+                moveH(this.moveHdata).then(res => {
+                    console.log(res)
+                    if (res.success) {
+                        this.loading();
+                        this.close();
+                        Message.success("移动成功")
+                    } else {
+                        Message.error(res.message)
+                    }
+                })
+            },
+            cacel() {
+                this.close()
+            },
+            close() {
+                this.$emit('close');
+            }
+        },
+        watch: {
+            moveHvisible(val) {
+                this.isVisible = val
+            }
+        }
+    }
+</script>
+
+<style scoped lang="less">
+    .bottom-radio{
+        text-align: center;
+    }
+    .el-radio{
+        padding: 20px;
+    }
+    .bottom-buttom {
+        margin-top: 20px;
+        text-align: center;
+    }
+</style>

@@ -10,51 +10,51 @@
             <div>
             <div>
                 <table border="1">
                 <table border="1">
                     <tr>
                     <tr>
-                        <td>层建筑面积</td>
+                        <td>层建筑面积(㎡)</td>
                         <td>
                         <td>
-                            <input type="text" v-model="qlcData.cjzmj" class="inputtitle"/>
+                            <el-input  v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input>
                         </td>
                         </td>
                         <td>
                         <td>
-                            层套内建筑面积
+                            层套内建筑面积(㎡)
                         </td>
                         </td>
                         <td>
                         <td>
-                            <input text="text" v-model="qlcData.ctnjzmj" class="inputtitle"/>
+                            <el-input  v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input>
                         </td>
                         </td>
                     </tr>
                     </tr>
                     <tr>
                     <tr>
-                        <td>层阳台面积</td>
+                        <td>层阳台面积(㎡)</td>
                         <td>
                         <td>
-                            <input type="text" v-model="qlcData.cytmj" class="inputtitle"/>
+                            <el-input  v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input>
                         </td>
                         </td>
                         <td>
                         <td>
-                            层半墙面积
+                            层半墙面积(㎡)
                         </td>
                         </td>
                         <td>
                         <td>
-                            <input text="text" v-model="qlcData.cbqmj" class="inputtitle"/>
+                            <el-input  v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input>
                         </td>
                         </td>
                     </tr>
                     </tr>
                     <tr>
                     <tr>
                         <td>层共有建筑面积(㎡)</td>
                         <td>层共有建筑面积(㎡)</td>
                         <td>
                         <td>
-                            <input type="text" v-model="qlcData.cgyjzmj" class="inputtitle"/>
+                            <el-input  v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input>
                         </td>
                         </td>
                         <td>
                         <td>
                             层分摊建筑面积(㎡)
                             层分摊建筑面积(㎡)
                         </td>
                         </td>
                         <td>
                         <td>
-                            <input text="text" v-model="qlcData.cftjzmj" class="inputtitle"/>
+                            <el-input  v-model="qlcData.cftjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层分摊建筑面积(㎡)"></el-input>
                         </td>
                         </td>
                     </tr>
                     </tr>
                     <tr>
                     <tr>
-                        <td>层高</td>
+                        <td>层高(m)</td>
                         <td>
                         <td>
-                            <input type="text" v-model="qlcData.cg" class="inputtitle"/>
+                            <el-input  v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input>
                         </td>
                         </td>
                         <td>
                         <td>
                             水平投影面积(㎡)
                             水平投影面积(㎡)
                         </td>
                         </td>
                         <td>
                         <td>
-                            <input text="text" v-model="qlcData.sptymj" class="inputtitle"/>
+                            <el-input v-model="qlcData.sptymj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="水平投影面积(㎡)"></el-input>
                         </td>
                         </td>
                     </tr>
                     </tr>
                 </table>
                 </table>
@@ -101,12 +101,16 @@
             }
             }
         },
         },
         methods: {
         methods: {
+            lodding:function(){
+                this.$emit('lodding')
+            },
             save: function () {
             save: function () {
                 this.qlcData['bsms'] = this.bsms
                 this.qlcData['bsms'] = this.bsms
                 updatePlc(this.qlcData).then(res => {
                 updatePlc(this.qlcData).then(res => {
                     console.log(res)
                     console.log(res)
                     if (res.success) {
                     if (res.success) {
                         Message.success("保存成功")
                         Message.success("保存成功")
+                        this.lodding()
                         this.close()
                         this.close()
                     } else {
                     } else {
                         Message.error(res.message)
                         Message.error(res.message)

@@ -313,6 +313,9 @@
             }
             }
         },
         },
         methods: {
         methods: {
+            lodding:function(){
+                this.$emit('lodding')
+            },
             addYtInfo(){
             addYtInfo(){
                 this.form.fwytList.push({
                 this.form.fwytList.push({
                     glbsm:'',
                     glbsm:'',
@@ -367,6 +370,7 @@
                 console.log(this.form)
                 console.log(this.form)
                 batchUpdateQjH(this.form).then((res)=>{
                 batchUpdateQjH(this.form).then((res)=>{
                     if(res.code===200){
                     if(res.code===200){
+                        this.lodding()
                         this.$message.success("保存成功！")
                         this.$message.success("保存成功！")
                     }
                     }
                 })
                 })

@@ -12,7 +12,7 @@
                 <table border="1">
                 <table border="1">
                     <tr>
                     <tr>
                         <td>室号前缀</td>
                         <td>室号前缀</td>
-                        <td>单元号</td>
+                        <td>幢单元号</td>
                         <td>分割符A</td>
                         <td>分割符A</td>
                         <td>层号前自动补0</td>
                         <td>层号前自动补0</td>
                         <td>层</td>
                         <td>层</td>
@@ -25,13 +25,13 @@
                             <input type="text" class="inputtitle" v-model="plshData.shqz"/>
                             <input type="text" class="inputtitle" v-model="plshData.shqz"/>
                         </td>
                         </td>
                         <td>
                         <td>
-                            <el-checkbox v-model="plshData.isSelectDyh"></el-checkbox>
+                            <el-checkbox v-model="plshData.selectDyh"></el-checkbox>
                         </td>
                         </td>
                         <td>
                         <td>
                             <input type="text" class="inputtitle" v-model="plshData.fgfA"/>
                             <input type="text" class="inputtitle" v-model="plshData.fgfA"/>
                         </td>
                         </td>
                         <td>
                         <td>
-                            <el-checkbox v-model="plshData.isChqbl"></el-checkbox>
+                            <el-checkbox v-model="plshData.chqbl"></el-checkbox>
                         </td>
                         </td>
                         <td>
                         <td>
                             <el-select v-model="plshData.c">
                             <el-select v-model="plshData.c">
@@ -112,9 +112,9 @@
                 xlVisible: false,
                 xlVisible: false,
                 plshData: {
                 plshData: {
                     shqz: '',
                     shqz: '',
-                    isSelectDyh: false,
+                    selectDyh: false,
                     fgfA: '',
                     fgfA: '',
-                    isChqbl: false,
+                    chqbl: false,
                     c: '',
                     c: '',
                     fgfB: '',
                     fgfB: '',
                     shhz: ''
                     shhz: ''
@@ -133,6 +133,9 @@
             }
             }
         },
         },
         methods: {
         methods: {
+            lodding:function(){
+              this.$emit('lodding')
+            },
             xl: function () {
             xl: function () {
                 this.xlVisible = true;
                 this.xlVisible = true;
             },
             },
@@ -144,9 +147,9 @@
             result: function () {
             result: function () {
                 this.plshData = {
                 this.plshData = {
                     shqz: '',
                     shqz: '',
-                    isSelectDyh: false,
+                    selectDyh: false,
                     fgfA: '',
                     fgfA: '',
-                    isChqbl: false,
+                    chqbl: false,
                     c: '',
                     c: '',
                     fgfB: '',
                     fgfB: '',
                     shhz: ''
                     shhz: ''
@@ -154,10 +157,11 @@
             },
             },
             save: function () {
             save: function () {
                 this.plshData['bsms'] = this.bsms
                 this.plshData['bsms'] = this.bsms
-                console.log(this.plshData)
                 updateSh(this.plshData).then(res => {
                 updateSh(this.plshData).then(res => {
                     if (res.success) {
                     if (res.success) {
+                        this.lodding();
                         this.close();
                         this.close();
+
                     } else {
                     } else {
                         Message.error(res.message)
                         Message.error(res.message)
                     }
                     }
@@ -173,7 +177,7 @@
                 if (this.plshData.shqz != "") {
                 if (this.plshData.shqz != "") {
                     gz += this.plshData.shqz
                     gz += this.plshData.shqz
                 }
                 }
-                if (this.plshData.isSelectDyh) {
+                if (this.plshData.selectDyh) {
                     gz += "[单元号]"
                     gz += "[单元号]"
                 }
                 }
                 if (this.plshData.fgfA != "") {
                 if (this.plshData.fgfA != "") {

@@ -196,10 +196,14 @@
             }
             }
         },
         },
         methods: {
         methods: {
+            lodding:function(){
+                this.$emit('lodding')
+            },
             save: function () {
             save: function () {
                 this.plzlData['bsms'] = this.bsms;
                 this.plzlData['bsms'] = this.bsms;
                 updateZl(this.plzlData).then(res => {
                 updateZl(this.plzlData).then(res => {
                     if (res.success) {
                     if (res.success) {
+                        this.lodding()
                         this.close();
                         this.close();
                     } else {
                     } else {
                         Message.error(res.message)
                         Message.error(res.message)

@@ -107,7 +107,7 @@
                     bdcqzh: "",
                     bdcqzh: "",
                     dylxs: ['zd'],
                     dylxs: ['zd'],
                     qlrmc: "",
                     qlrmc: "",
-                    qszt: "2",
+                    qszt: ["2"],
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
                     zl: "",
                     zl: "",
@@ -151,7 +151,7 @@
                     bdcdyh: "",
                     bdcdyh: "",
                     bdcqzh: "",
                     bdcqzh: "",
                     qlrmc: "",
                     qlrmc: "",
-                    qszt: "2",
+                    qszt: ["2"],
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
                     zl: "",
                     zl: "",

@@ -103,7 +103,7 @@ export default {
 				bdcqzh: "",
 				bdcqzh: "",
 				dylxs: [],
 				dylxs: [],
 				qlrmc: "",
 				qlrmc: "",
-				qszt: "",
+				qszt: [],
 				xmmc: "",
 				xmmc: "",
 				zddm: "",
 				zddm: "",
 				zl: "",
 				zl: "",
@@ -131,7 +131,7 @@ export default {
 				bdcqzh: "",
 				bdcqzh: "",
 				dylxs: [],
 				dylxs: [],
 				qlrmc: "",
 				qlrmc: "",
-				qszt: "",
+				qszt: [],
 				xmmc: "",
 				xmmc: "",
 				zddm: "",
 				zddm: "",
 				zl: "",
 				zl: "",

+<template>
+    <div>
+        <el-dialog
+                title="新增"
+                :visible.sync="isVisible"
+                width="50%"
+                @close="close"
+                :modal-append-to-body="false"
+                center>
+            <div class="search">
+                <el-button type="primary" @click="search">查询</el-button>
+                <el-button type="primary" @click="result">重置</el-button>
+                <el-row :gutter="10" class="shop">
+                    <el-col :span="4" class="inputtitle">
+                        宗地编码:
+                    </el-col>
+                    <el-col :span="8" class="">
+                        <el-input v-model="queryData.zddm"></el-input>
+                    </el-col>
+                    <el-col :span="4" class="inputtitle">
+                        不动产权证号:
+                    </el-col>
+                    <el-col :span="8" class="">
+                        <el-input v-model="queryData.bdcqzh"></el-input>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="10">
+                    <el-col :span="4" class="inputtitle">
+                        不动产权单元号:
+                    </el-col>
+                    <el-col :span="8">
+                        <el-input v-model="queryData.bdcdyh"></el-input>
+                    </el-col>
+                    <el-col :span="4" class="inputtitle">
+                        权利人:
+                    </el-col>
+                    <el-col :span="8">
+                        <el-input v-model="queryData.qlrmc"></el-input>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="10">
+                    <el-col :span="4" class="inputtitle">
+                        坐落:
+                    </el-col>
+                    <el-col :span="8">
+                        <el-input v-model="queryData.zl"></el-input>
+                    </el-col>
+                </el-row>
+                <table border="1">
+                    <tr>
+                        <td>序号</td>
+                        <td>操作</td>
+                        <td>宗地代码</td>
+                        <td>不动产单元号</td>
+                        <td>项目名称</td>
+                        <td>不动产权证号</td>
+                        <td>权利人</td>
+                        <td>坐落</td>
+                    </tr>
+                    <tr v-if="Data.length==0">
+                        <td colspan="8">
+                            <span class="noData">暂无数据</span>
+                        </td>
+                    </tr>
+                    <tr v-else v-for="(item,index) in Data" :key="index">
+                        <td>{{index+1}}</td>
+                        <td @click="addData(item)" class="xz">
+                            <span>选择</span>
+                        </td>
+                        <td>{{item.zddm}}</td>
+                        <td>{{item.bdcdyh}}</td>
+                        <td>{{item.xmmc}}</td>
+                        <td>{{item.bdcqzh}}</td>
+                        <td>{{item.qlr}}</td>
+                        <td>{{item.zl}}</td>
+                    </tr>
+
+                </table>
+            </div>
+            <span slot="footer" class="dialog-footer">
+              </span>
+            <div class="page">
+                <el-pagination
+                        background
+                        layout="prev, pager, next,total"
+                        :page-size="queryData.pageSize"
+                        :total="total"
+                        @current-change="currentChange"
+                >
+                </el-pagination>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+    import {zdlist} from './../../api/search'
+
+    export default {
+        name: "zdQueryData",
+        data() {
+            return {
+                total:1,
+                queryData: {
+                    bdcdyh: "",
+                    bdcqzh: "",
+                    dylxs: ['zd'],
+                    qlrmc: "",
+                    qszt: ["2"],
+                    xmmc: "",
+                    zddm: "",
+                    zl: "",
+                    pageNo: 1,
+                    pageSize: 10,
+                },
+                Data: [],
+                isVisible: false
+            }
+        },
+        props: {
+            centerDialogVisible: {
+                type: Boolean,
+                default: function () {
+                    return false
+                }
+            },
+            qszt:{
+              type:Array,
+              default:function () {
+                  return ['2']
+              }
+            },
+            isZdClose:{
+                type:Boolean,
+                default:false
+            }
+        },
+        mounted() {
+            this.getData(this.queryData)
+        },
+        created() {
+        },
+        methods: {
+            currentChange: function (val) {
+                this.queryData.pageNo = val;
+                this.getData(this.queryData);
+            },
+            result: function () {
+                this.queryData = {
+                    bdcdyh: "",
+                    bdcqzh: "",
+                    qlrmc: "",
+                    qszt: ["2"],
+                    xmmc: "",
+                    zddm: "",
+                    zl: "",
+                    pageNo: 1,
+                    pageSize: 10
+                };
+                this.getData(this.queryData)
+            },
+            getData: function (data) {
+                data['dylxs'] = this.dylxs;
+                zdlist(data).then(res => {
+                    this.Data = res.result.records
+                    this.total = res.result.total;
+                })
+            },
+            search: function () {
+                this.getData(this.queryData)
+            },
+            addData: function (val) {
+                this.$emit("getData", val)
+                if (this.isZdClose) {
+                    this.close();
+                }
+            },
+            close: function () {
+                this.$emit('close')
+                this.result();
+            }
+        },
+        watch: {
+            centerDialogVisible(val) {
+                this.isVisible = val
+            }
+        }
+    }
+</script>
+
+<style scoped lang="less">
+
+    .main {
+        box-sizing: border-box;
+        padding: 18px;
+        height: auto;
+        width: 80%;
+    }
+
+    table {
+        margin-top: 10px;
+        background-color: #fff;
+        font-size: 14px;
+        width: 100%;
+        tr:hover{
+            background-color: #F5F7FA;
+        }
+    }
+
+    td {
+        text-align: center;
+        height: 36px;
+        min-width: 50px;
+    }
+
+    table:hover {
+        cursor: pointer;
+    }
+
+    .inputtitle {
+        line-height: 40px;
+    }
+
+    .shop {
+        margin-top: 20px;
+    }
+
+    .xz {
+        color: blue;
+    }
+
+    .noData {
+        color: #b2b2b2;
+    }
+
+</style>

@@ -168,9 +168,12 @@ export default {
 				this.getTreeList();
 				this.getTreeList();
 			}
 			}
 		},
 		},
-		// "$store.state.zdbsm": function(bsm) {
-		// 	this.getRightTree(bsm);
-		// },
+		"$store.state.zdbsm": function(bsm) {
+			this.getRightTree(bsm);
+		},
+	},
+	mounted(){
+
 	},
 	},
 	created() {
 	created() {
 		if (this.$route.meta) {
 		if (this.$route.meta) {
@@ -451,7 +454,7 @@ export default {
 				color: #006cff;
 				color: #006cff;
 				border-left: 1px solid #EAEAEA;
 				border-left: 1px solid #EAEAEA;
     			border-right: 1px solid #EAEAEA;
     			border-right: 1px solid #EAEAEA;
-				height: 59px;
+				height: 58px;
 				border-bottom: 1px solid #FFF;
 				border-bottom: 1px solid #FFF;
 			}
 			}
 		}
 		}

@@ -10,22 +10,22 @@
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >宗地代码</td>
                     <td  colspan="2" align="center"  >宗地代码</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <el-input v-model="form.zddm"></el-input>
+                        <input class="formInput" v-model="form.zddm">
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >不动产单元号</td>
                     <td  colspan="2" align="center"  >不动产单元号</td>
-                    <td  colspan="4"  >
-                        <el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
-                        <el-button @click.prevent="generatorCode"  size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
+                    <td  colspan="4"  class="psr">
+                        <input class="formInput percent80" v-model="form.bdcdyh">
+                        <el-button @click.prevent="generatorCode"  size="mini" class="createBtn" type="warning">生成</el-button>
                     </td>
                     </td>
                 </tr>
                 </tr>
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >项目名称</td>
                     <td  colspan="2" align="center"  >项目名称</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <el-input v-model="form.xmmc"></el-input>
+                        <input class="formInput" v-model="form.xmmc">
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >房屋性质</td>
                     <td  colspan="2" align="center"  >房屋性质</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <el-select v-model="form.fwxzbsm" placeholder="请选择" >
+                        <el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
                             <el-option
                             <el-option
                                     v-for="item in $store.state.fwxzOptions"
                                     v-for="item in $store.state.fwxzOptions"
                                     :key="item.bsm"
                                     :key="item.bsm"
@@ -39,7 +39,7 @@
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >房屋类型</td>
                     <td  colspan="2" align="center"  >房屋类型</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <el-select v-model="form.fwlxbsm" placeholder="请选择" >
+                        <el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" >
                             <el-option
                             <el-option
                                     v-for="item in $store.state.fwlxList"
                                     v-for="item in $store.state.fwlxList"
                                     :key="item.bsm"
                                     :key="item.bsm"
@@ -61,7 +61,7 @@
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >产别</td>
                     <td  colspan="2" align="center"  >产别</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <el-select v-model="form.fwcbbsm" placeholder="请选择" >
+                        <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
                             <el-option
                             <el-option
                                     v-for="item in $store.state.cbOptions"
                                     v-for="item in $store.state.cbOptions"
                                     :key="item.bsm"
                                     :key="item.bsm"
@@ -72,7 +72,7 @@
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >产权来源</td>
                     <td  colspan="2" align="center"  >产权来源</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
-                        <el-select v-model="form.fwcqlybsm" placeholder="请选择" >
+                        <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
                             <el-option
                             <el-option
                                     v-for="item in  $store.state.cqlyOptions"
                                     v-for="item in  $store.state.cqlyOptions"
                                     :key="item.bsm"
                                     :key="item.bsm"
@@ -127,26 +127,23 @@
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >共有土地面积（㎡）</td>
                     <td  colspan="2" align="center"  >共有土地面积（㎡）</td>
                     <td  colspan="2"  >
                     <td  colspan="2"  >
-                        <el-input v-model="form.zdmj"></el-input>
+                        <input class="formInput" v-model="form.zdmj">
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >分摊土地面积（㎡）</td>
                     <td  colspan="2" align="center"  >分摊土地面积（㎡）</td>
                     <td  colspan="2"  >
                     <td  colspan="2"  >
-                        <el-input v-model="form.fttdsymj"></el-input>
+                        <input class="formInput" v-model="form.fttdsymj">
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >多幢独用土地面积（㎡）</td>
                     <td  colspan="2" align="center"  >多幢独用土地面积（㎡）</td>
                     <td  colspan="2"  >
                     <td  colspan="2"  >
-                        <el-input v-model="form.dlsytdmj"></el-input>
+                        <input class="formInput" v-model="form.dlsytdmj">
                     </td>
                     </td>
                 </tr>
                 </tr>
 
 
                 <tr>
                 <tr>
-                    <td colspan="12" rowspan="4" align="center">
-                        <Qlxz ref="qlxzModule"></Qlxz>
+                    <td colspan="12" align="center">
+                        <Qlxz ref="qlxzModule"  :formData="form"></Qlxz>
                     </td>
                     </td>
                 </tr>
                 </tr>
-                <tr></tr>
-                <tr></tr>
-                <tr></tr>
 
 
 
 
                 <tr height="30">
                 <tr height="30">
@@ -154,7 +151,7 @@
                         <span>坐落</span>
                         <span>坐落</span>
                     </td>
                     </td>
                     <td   colspan="10"  >
                     <td   colspan="10"  >
-                        <el-input v-model="form.zl"></el-input>
+                        <input class="formInput" v-model="form.zl">
                     </td>
                     </td>
                 </tr>
                 </tr>
 
 
@@ -163,7 +160,7 @@
                         <span>附加说明</span>
                         <span>附加说明</span>
                     </td>
                     </td>
                     <td   colspan="10" rowspan="2"   >
                     <td   colspan="10" rowspan="2"   >
-                        <el-input v-model="form.bz" type="textarea"></el-input>
+                        <input class="formInput" v-model="form.bz" type="textarea">
                     </td>
                     </td>
                 </tr>
                 </tr>
                 <tr height="30">
                 <tr height="30">
@@ -174,7 +171,7 @@
                         <span>调查意见</span>
                         <span>调查意见</span>
                     </td>
                     </td>
                     <td   colspan="10"  >
                     <td   colspan="10"  >
-                        <el-input v-model="form.name"></el-input>
+                        <input class="formInput" v-model="form.name">
                     </td>
                     </td>
                 </tr>
                 </tr>
 
 
@@ -183,7 +180,7 @@
                         <span>审查员</span>
                         <span>审查员</span>
                     </td>
                     </td>
                     <td   colspan="2"  >
                     <td   colspan="2"  >
-                        <el-input v-model="form.name"></el-input>
+                        <input class="formInput" v-model="form.name">
                     </td>
                     </td>
                     <td   colspan="2" rowspan="2" align="right"  style="width:8.33%;padding-right:10px">
                     <td   colspan="2" rowspan="2" align="right"  style="width:8.33%;padding-right:10px">
                         <span>审查日期</span>
                         <span>审查日期</span>
@@ -481,10 +478,6 @@
         box-sizing: border-box;
         box-sizing: border-box;
         padding: 18px;
         padding: 18px;
         padding-bottom: 0;
         padding-bottom: 0;
-        /deep/.el-input__inner{
-            width: 100%;
-            border: 0;
-        }
 
 
         /deep/textarea{
         /deep/textarea{
             width: 100%;
             width: 100%;
@@ -503,13 +496,12 @@
         }
         }
 
 
         td{
         td{
-            //bgcolor:#F1F4FC;
-            bgcolor:#fff;
-            width:8.33%
+            height: 36px;
+            width:8.33%;
         }
         }
 
 
         .el-select{
         .el-select{
-            display:block;
+            width: 100%;
         }
         }
 
 
         table{
         table{
@@ -518,6 +510,15 @@
 
 
         .dzTable{
         .dzTable{
             margin-top: 10px;
             margin-top: 10px;
+            /deep/.el-input__inner {
+                margin: 0;
+                height: 36px;
+                outline: none;
+                border: none;
+                color: #606764;
+                overflow: visible;
+                text-align: center;
+            }
         }
         }
     }
     }
 </style>
 </style>
\ No newline at end of file

@@ -61,7 +61,7 @@
                 total: 0,
                 total: 0,
                 pageNo: 1,
                 pageNo: 1,
                 pageSize: 10,
                 pageSize: 10,
-                qszt: 1,
+                qszt: ['1', '2'],
                 queryData: {},
                 queryData: {},
                 formData: {
                 formData: {
                     user: "",
                     user: "",

 <template>
 <template>
 	<div class="main">
 	<div class="main">
 		<div class="search">
 		<div class="search">
-            <el-row>
-				<el-col :span="24">
 			<el-form :inline="true" class="demo-form-inline">
 			<el-form :inline="true" class="demo-form-inline">
+				<el-row>
+					<el-col :span="8">
 						<el-form-item label="宗地编码">
 						<el-form-item label="宗地编码">
 							<el-input
 							<el-input
 								v-model="queryData.zddm"
 								v-model="queryData.zddm"
 								placeholder="输入宗地编码"
 								placeholder="输入宗地编码"
-								@change="query"
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
+					</el-col>
+					<el-col :span="8">
 						<el-form-item label="不动产权证号">
 						<el-form-item label="不动产权证号">
 							<el-input
 							<el-input
 								v-model="queryData.bdcqzh"
 								v-model="queryData.bdcqzh"
 								placeholder="输入坐落地址"
 								placeholder="输入坐落地址"
-								@change="query"
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
+					</el-col>
+					<el-col :span="8">
 						<el-form-item label="不动产单元号">
 						<el-form-item label="不动产单元号">
 							<el-input
 							<el-input
 								v-model="queryData.bdcdyh"
 								v-model="queryData.bdcdyh"
 								placeholder="输入不动产单元号"
 								placeholder="输入不动产单元号"
-								@change="query"
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="8">
 						<el-form-item label="权利人">
 						<el-form-item label="权利人">
 							<el-input
 							<el-input
 								v-model="queryData.qlrmc"
 								v-model="queryData.qlrmc"
 								placeholder="输入权利人姓名"
 								placeholder="输入权利人姓名"
-								@change="query"
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
+					</el-col>
+					<el-col :span="8">
 						<el-form-item label="坐落">
 						<el-form-item label="坐落">
 							<el-input
 							<el-input
 								v-model="queryData.zl"
 								v-model="queryData.zl"
 								placeholder="输入坐落地址"
 								placeholder="输入坐落地址"
-								@change="query"
 							></el-input>
 							></el-input>
 						</el-form-item>
 						</el-form-item>
-
-					</el-form>
 					</el-col>
 					</el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="24">
-					<el-form :inline="true" :model="queryData" class="demo-form-inline">
-						<el-form-item class="demo-form-inline" label="查询范围">
-							<el-checkbox-group v-model="queryData.dylxs" @change="query">
-								<el-checkbox label="zd" name="type">宗地</el-checkbox>
-								<el-checkbox label="dz" name="type">多幢</el-checkbox>
-								<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
-								<el-checkbox label="h" name="type">户</el-checkbox>
-								<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
-								<el-checkbox label="lq" name="type">林权</el-checkbox>
-								<el-checkbox label="zh" name="type">宗海</el-checkbox>
-							</el-checkbox-group>
-						</el-form-item>
-                        
-                    <el-button type="primary" @click="query">查询</el-button>
-                    <el-button type="warning" @click="reset">重置</el-button>
-					</el-form>
-				</el-col>
-				<el-col :span="2">
+					<el-col :span="8">
+						<el-button type="primary" @click="search">查询</el-button>
+						<el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
 					</el-col>
 					</el-col>
 				</el-row>
 				</el-row>
+			</el-form>
 
 
-            <el-table
-                    :data="Data"
-                    :height="tableHeight"
-                    :row-class-name="tableRowClassName"
-            >
+			<el-table :data="Data" :height="tableHeight">
 				<td class="xh">序号</td>
 				<td class="xh">序号</td>
 				<td class="cz">操作</td>
 				<td class="cz">操作</td>
 				<td class="zddm">宗地代码</td>
 				<td class="zddm">宗地代码</td>
@@ -122,12 +104,12 @@
 </template>
 </template>
 
 
 <script>
 <script>
-    import {getSearchList} from "./../../../../api/search";
-    import cxlzQueryData from "../../../../components/cxlxQueryData/cxlzQueryData";
+import { getSearchList } from "./../../../../api/search";
+import cxlzQueryData from "../../../../components/cxlxQueryData/cxlzQueryData";
 
 
-    export default {
+export default {
 	name: "",
 	name: "",
-        components: {cxlzQueryData},
+	components: { cxlzQueryData },
 	props: {},
 	props: {},
 	data() {
 	data() {
 		return {
 		return {
@@ -139,7 +121,7 @@
 				bdcqzh: "",
 				bdcqzh: "",
 				dylxs: ["zrz"],
 				dylxs: ["zrz"],
 				qlrmc: "",
 				qlrmc: "",
-                    qszt: "2",
+				qszt: ["2"],
 				xmmc: "",
 				xmmc: "",
 				zddm: "",
 				zddm: "",
 				zl: "",
 				zl: "",
@@ -148,43 +130,48 @@
 			},
 			},
 			Data: [],
 			Data: [],
 			dylxs: ["zd"],
 			dylxs: ["zd"],
-                tableHeight:0
+			tableHeight: 0,
 		};
 		};
 	},
 	},
-        created() {
-        },
+	created() {},
 	mounted() {
 	mounted() {
 		this.getData(this.queryData);
 		this.getData(this.queryData);
-            if ((document.documentElement.clientWidth || document.body.clientWidth) < 1890) {
-                this.$nextTick(()=>{
-                    this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 355;
-                })
-            }else{
-                this.$nextTick(()=>{
-                    this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 304;
-                })
+		if (
+			(document.documentElement.clientWidth || document.body.clientWidth) < 1890
+		) {
+			this.$nextTick(() => {
+				this.tableHeight =
+					(document.documentElement.clientHeight ||
+						document.body.clientHeight) - 355;
+			});
+		} else {
+			this.$nextTick(() => {
+				this.tableHeight =
+					(document.documentElement.clientHeight ||
+						document.body.clientHeight) - 304;
+			});
 		}
 		}
 	},
 	},
 	methods: {
 	methods: {
-            currentChange: function (val) {
+		currentChange: function(val) {
 			console.log(`当前页: ${val}`);
 			console.log(`当前页: ${val}`);
 			this.queryData.pageNo = val;
 			this.queryData.pageNo = val;
 			this.getData(this.queryData);
 			this.getData(this.queryData);
 		},
 		},
-            xzzrz: function (item) {
+		xzzrz: function(item) {
 			this.centerDialogVisible = true;
 			this.centerDialogVisible = true;
 			this.zrzbsm = item.glbsm;
 			this.zrzbsm = item.glbsm;
 		},
 		},
-            close: function () {
+		close: function() {
 			this.centerDialogVisible = false;
 			this.centerDialogVisible = false;
 		},
 		},
-            result: function () {
+		result: function() {
 			this.queryData = {
 			this.queryData = {
 				bdcdyh: "",
 				bdcdyh: "",
 				bdcqzh: "",
 				bdcqzh: "",
 				dylxs: ["zrz"],
 				dylxs: ["zrz"],
 				qlrmc: "",
 				qlrmc: "",
-                    qszt: "2",
+				qszt: ["2"],
 				xmmc: "",
 				xmmc: "",
 				zddm: "",
 				zddm: "",
 				zl: "",
 				zl: "",
@@ -193,37 +180,38 @@
 			};
 			};
 			this.getData(this.queryData);
 			this.getData(this.queryData);
 		},
 		},
-            getData: function (data) {
+		getData: function(data) {
 			getSearchList(data).then((res) => {
 			getSearchList(data).then((res) => {
 				this.Data = res.result.records;
 				this.Data = res.result.records;
 				this.total = res.result.total;
 				this.total = res.result.total;
 			});
 			});
 		},
 		},
-            search: function () {
+		search: function() {
 			this.getData(this.queryData);
 			this.getData(this.queryData);
 		},
 		},
 	},
 	},
 	computed: {},
 	computed: {},
 	watch: {},
 	watch: {},
-    };
+};
 </script>
 </script>
 <style scoped lang="less">
 <style scoped lang="less">
-    .main {
+.main {
 	box-sizing: border-box;
 	box-sizing: border-box;
 	padding: 18px;
 	padding: 18px;
 	height: auto;
 	height: auto;
-    }
+}
 
 
-    table {
+table {
 	margin-top: 10px;
 	margin-top: 10px;
 	background-color: #fff;
 	background-color: #fff;
 	font-size: 14px;
 	font-size: 14px;
 	width: 100%;
 	width: 100%;
 	table-layout: fixed;
 	table-layout: fixed;
-        tr:hover{
-            background-color: #F5F7FA;
+	tr:hover {
+		background-color: #f5f7fa;
 	}
 	}
-        td, th {
+	td,
+	th {
 		text-align: center;
 		text-align: center;
 		height: 36px;
 		height: 36px;
 		min-width: 50px;
 		min-width: 50px;
@@ -232,77 +220,88 @@
 		-ms-text-overflow: ellipsis;
 		-ms-text-overflow: ellipsis;
 		text-overflow: ellipsis;
 		text-overflow: ellipsis;
 	}
 	}
-    }
+}
 
 
-    table:hover {
+table:hover {
 	cursor: pointer;
 	cursor: pointer;
-    }
+}
 
 
-    .inputtitle {
+.inputtitle {
 	line-height: 40px;
 	line-height: 40px;
-        span{
+	span {
 		display: inline-block;
 		display: inline-block;
 		width: 120px;
 		width: 120px;
 		text-align: left;
 		text-align: left;
 	}
 	}
-        /deep/ .el-input{
+	/deep/ .el-input {
 		width: calc(100% - 120px);
 		width: calc(100% - 120px);
 	}
 	}
-    }
+}
 
 
-    .shop {
+.shop {
 	margin-top: 20px;
 	margin-top: 20px;
-    }
+}
 
 
-    .xh {
+.xh {
 	width: 50px;
 	width: 50px;
-    }
+}
 
 
-    .zddm {
+.zddm {
 	width: 120px;
 	width: 120px;
-    }
+}
 
 
-    .bdcdyh {
+.bdcdyh {
 	width: 180px;
 	width: 180px;
-    }
+}
 
 
-    .xmmc {
+.xmmc {
 	width: 100px;
 	width: 100px;
-    }
+}
 
 
-    .bdcqzh {
+.bdcqzh {
 	width: 100px;
 	width: 100px;
-    }
+}
 
 
-    .qlr {
+.qlr {
 	width: 100px;
 	width: 100px;
-    }
+}
 
 
-    .zl {
+.zl {
 	width: 100px;
 	width: 100px;
-    }
+}
 
 
-    .cz {
+.cz {
 	width: 50px;
 	width: 50px;
 	span {
 	span {
 		color: blue;
 		color: blue;
 	}
 	}
-    }
+}
 
 
-    .noData {
+.noData {
 	color: #b2b2b2;
 	color: #b2b2b2;
-    }
+}
 
 
-    .page {
+.page {
 	position: fixed;
 	position: fixed;
 	bottom: 20px;
 	bottom: 20px;
 	width: auto;
 	width: auto;
 	height: auto;
 	height: auto;
-    }
-    /deep/ .el-form-item__label{
+}
+/deep/ .el-form-item__label {
 	width: 96px;
 	width: 96px;
-    }
-    /deep/ .el-form{
+}
+/deep/ .el-form {
     margin-left: -28px;
     margin-left: -28px;
+    .el-button{
+        margin: 0 22px;
+    }
+}
+.el-form-item{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 20px;
+    /deep/.el-form-item__content{
+        width: calc(100% - 96px);
     }
     }
+}
 </style>
 </style>

@@ -57,7 +57,15 @@
                                 <th class="zxx">幢信息</th>
                                 <th class="zxx">幢信息</th>
                             </tr>
                             </tr>
                             <tr v-for="(item,index) in fghData.newZdlist" :key="index">
                             <tr v-for="(item,index) in fghData.newZdlist" :key="index">
-                                <td @click="delRow(index)" class="cz">-</td>
+                                <td class="cz">
+                                    <el-button
+                                            type="primary"
+                                            class="changeBtn outMinus addMinus"
+                                            @click="delRow(index)"
+                                    >-
+                                    </el-button
+                                    >
+                                </td>
                                 <td class="xzq">
                                 <td class="xzq">
                                     <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
                                     <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
                                         <el-option
                                         <el-option
@@ -117,7 +125,15 @@
                                 </td>
                                 </td>
                             </tr>
                             </tr>
                             <tr>
                             <tr>
-                                <td @click="addRow">+</td>
+                                <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>
@@ -170,8 +186,8 @@
                         </div>
                         </div>
                     </el-dialog>
                     </el-dialog>
 
 
-                    <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
-                                @close="close"></query-data>
+                    <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
+                                @close="close"></zd-query-data>
                     <div class="header-button" :style="{width:fgBoxWidth+'px'}">
                     <div class="header-button" :style="{width:fgBoxWidth+'px'}">
                         <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
                         <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
                     </div>
                     </div>
@@ -233,7 +249,15 @@
                                 <th class="zxx">幢信息</th>
                                 <th class="zxx">幢信息</th>
                             </tr>
                             </tr>
                             <tr v-for="(item,index) in fghData.newZdlist" :key="index">
                             <tr v-for="(item,index) in fghData.newZdlist" :key="index">
-                                <td @click="delRow(index)" class="cz">-</td>
+                                <td class="cz">
+                                    <el-button
+                                            type="primary"
+                                            class="changeBtn outMinus addMinus"
+                                            @click="delRow(index)"
+                                    >-
+                                    </el-button
+                                    >
+                                </td>
                                 <td class="xzq">
                                 <td class="xzq">
                                     <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
                                     <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
                                         <el-option
                                         <el-option
@@ -293,7 +317,14 @@
                                 </td>
                                 </td>
                             </tr>
                             </tr>
                             <tr>
                             <tr>
-                                <td @click="addRow">+</td>
+                                <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>
@@ -409,7 +440,16 @@
                                 <th class="zxx">幢信息</th>
                                 <th class="zxx">幢信息</th>
                             </tr>
                             </tr>
                             <tr v-for="(item,index) in fghData.newZdlist" :key="index">
                             <tr v-for="(item,index) in fghData.newZdlist" :key="index">
-                                <td @click="delRow(index)" class="cz">-</td>
+
+                                <td class="cz">
+                                    <el-button
+                                            type="primary"
+                                            class="changeBtn outMinus addMinus"
+                                            @click="delRow(index)"
+                                    >-
+                                    </el-button
+                                    >
+                                </td>
                                 <td class="xzq">
                                 <td class="xzq">
                                     <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
                                     <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
                                         <el-option
                                         <el-option
@@ -469,7 +509,14 @@
                                 </td>
                                 </td>
                             </tr>
                             </tr>
                             <tr>
                             <tr>
-                                <td @click="addRow">+</td>
+                                <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>
@@ -531,19 +578,6 @@
             </el-tab-pane>
             </el-tab-pane>
         </el-tabs>
         </el-tabs>
     </div>
     </div>
-    <!-- <div class="lpb">
-     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="编辑楼盘" name="edit">
-        <bjlp></bjlp>
-      </el-tab-pane>
-      <el-tab-pane label="预览楼盘" name="preview">
-        <yllp></yllp>
-      </el-tab-pane>
-      <el-tab-pane label="详细信息" name="detail">
-        <xxxx></xxxx>
-      </el-tab-pane>
-    </el-tabs>
-  </div> -->
 </template>
 </template>
 
 
 <script>
 <script>
@@ -555,12 +589,13 @@
     } from "./../../../../api/common";
     } from "./../../../../api/common";
     import {getQjZdjbxxDetailById} from './../../../../api/zd'
     import {getQjZdjbxxDetailById} from './../../../../api/zd'
     import QueryData from './../../../../components/queryData/queryData'
     import QueryData from './../../../../components/queryData/queryData'
+    import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
     import {zdfg} from './../../../../api/zd'
     import {zdfg} from './../../../../api/zd'
     import {Message} from 'element-ui'
     import {Message} from 'element-ui'
 
 
     export default {
     export default {
         name: "",
         name: "",
-        components: {QueryData},
+        components: {QueryData,zdQueryData},
         props: {},
         props: {},
         data() {
         data() {
             return {
             return {
@@ -964,7 +999,7 @@
         width: 100px;
         width: 100px;
     }
     }
 
 
-    .xzq, .djq, djzq {
+    .xzq, .djq, .djzq {
         width: 150px;
         width: 150px;
     }
     }
 </style>
 </style>

@@ -69,7 +69,7 @@ export default {
 	props: {},
 	props: {},
 	data() {
 	data() {
 		return {
 		return {
-			qszt: 2,
+			qszt: ['2'],
 			total: 0,
 			total: 0,
 			pageNo: 1,
 			pageNo: 1,
 			pageSize: 10,
 			pageSize: 10,
@@ -121,30 +121,31 @@ export default {
 		},
 		},
 		//点击办理
 		//点击办理
 		handleClick(row) {
 		handleClick(row) {
-			console.log("fwsxbg");
-			console.log(row);
-			var params = { bsm: row.glbsm, type: row.dylx };
+			let params = { bsm: row.glbsm, type: row.dylx };
+			this.$confirm('是否确定范围属性变更?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
 				fwsxbgbl(params)
 				fwsxbgbl(params)
 					.then((res) => {
 					.then((res) => {
 						if (res.code == 200) {
 						if (res.code == 200) {
 							this.$message({
 							this.$message({
 								message: res.message,
 								message: res.message,
-							type: "success",
+								type: "变更成功",
 							});
 							});
-						var newGlbsm=res.result;
-
 							let path = "";
 							let path = "";
 							switch (row.dylx) {
 							switch (row.dylx) {
 								case "zrz":
 								case "zrz":
-								this.$store.state.zrzbsm = newGlbsm;
+									this.$store.state.zrzbsm = res.result;
 									path = "/zrz";
 									path = "/zrz";
 									break;
 									break;
 								case "zd":
 								case "zd":
-								this.$store.state.zdbsm = newGlbsm;
+									this.$store.state.zdbsm = res.result;
 									path = "/zd";
 									path = "/zd";
 									break;
 									break;
 								case "dz":
 								case "dz":
-								this.$store.state.dzbsm = newGlbsm;
+									this.$store.state.dzbsm = res.result;
 									path = "/dz";
 									path = "/dz";
 									break;
 									break;
 								default:
 								default:
@@ -170,6 +171,9 @@ export default {
 						type: "error",
 						type: "error",
 					});
 					});
 				});
 				});
+			}).catch(() => {
+
+			});
 
 
 		},
 		},
 	},
 	},

@@ -3,14 +3,9 @@
         <el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
         <el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
             <el-tab-pane label="宗地合并" name="zd">
             <el-tab-pane label="宗地合并" name="zd">
                 <div class="hb-tabs">
                 <div class="hb-tabs">
-
                     <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
                     <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
-                    <div class="header">
-                        <span>合并后项目名称</span>
-                        <el-input></el-input>
-                    </div>
-
-                    <div class="table">
+                    <div class="hbq">
+                        <span class="tips">合并前宗地信息</span>
                         <table border="1">
                         <table border="1">
                             <tr>
                             <tr>
                                 <td class="xh">序号</td>
                                 <td class="xh">序号</td>
@@ -28,17 +23,95 @@
                             </tr>
                             </tr>
                             <tr v-else v-for="(item,index) in bgqData" :key="index">
                             <tr v-else v-for="(item,index) in bgqData" :key="index">
                                 <td class="xh">{{index+1}}</td>
                                 <td class="xh">{{index+1}}</td>
-                                <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td>
-                                <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td>
-                                <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td>
-                                <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td>
-                                <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td>
-                                <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
+                                <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
+                                                        readonly="readonly"/></td>
+                                <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
+                                                          readonly="readonly"/></td>
+                                <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
+                                                        readonly="readonly"/></td>
+                                <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
+                                                          readonly="readonly"/></td>
+                                <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
+                                                       readonly="readonly"/></td>
+                                <td class="zl"><input type="text" class="formInput" v-model="item.zl"
+                                                      readonly="readonly"/></td>
                             </tr>
                             </tr>
                         </table>
                         </table>
                     </div>
                     </div>
-                    <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
-                                @close="close"></query-data>
+                    <div class="hbh">
+                        <span class="tips">合并后宗地信息</span>
+                        <table border="1">
+                            <tr>
+                                <th class="xzq">行政区</th>
+                                <th class="djq">地籍区</th>
+                                <th class="djzq">地籍子区</th>
+                                <th class="syqlx">所有权类型</th>
+                                <th class="tdtzm">土地特征码</th>
+                                <th class="xmmc">项目名称</th>
+                                <th class="zxx">幢信息</th>
+                            </tr>
+                            <tr>
+                                <td class="xzq">
+                                    <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
+                                        <el-option
+                                                v-for="i in xzq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="djq">
+                                    <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
+                                        <el-option
+                                                v-for="i in djq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="syqlx">
+                                    <el-select v-model="hbhData.djzqbsm">
+                                        <el-option
+                                                v-for="i in djzq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="tdtzm">
+                                    <el-select v-model="hbhData.syqlxbsm">
+                                        <el-option
+                                                v-for="i in syq"
+                                                :key="i.value"
+                                                :label="i.label"
+                                                :value="i.value"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="syqlx">
+                                    <el-select v-model="hbhData.zdtzmbsm">
+                                        <el-option
+                                                v-for="i in tdtzm"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="xmmc">
+                                    <input type="text" v-model="hbhData.xmmc" class="formInput"/>
+                                </td>
+                                <td class="zxx">
+                                    <span class="xz">选择</span>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
+                                @close="close"></zd-query-data>
 
 
                     <div class="header-button" :style="{width:fgBoxWidth+'px'}">
                     <div class="header-button" :style="{width:fgBoxWidth+'px'}">
                         <el-button type="primary" class="saveBtn">保存</el-button>
                         <el-button type="primary" class="saveBtn">保存</el-button>
@@ -48,11 +121,8 @@
             <el-tab-pane label="多幢合并" name="dz">
             <el-tab-pane label="多幢合并" name="dz">
                 <div class="hb-tabs">
                 <div class="hb-tabs">
                     <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
                     <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
-                    <div class="header">
-                        <span>合并后项目名称</span>
-                        <el-input></el-input>
-                    </div>
-                    <div class="table">
+                    <div class="hbq">
+                        <span class="tips">合并前宗地信息</span>
                         <table border="1">
                         <table border="1">
                             <tr>
                             <tr>
                                 <td class="xh">序号</td>
                                 <td class="xh">序号</td>
@@ -70,12 +140,90 @@
                             </tr>
                             </tr>
                             <tr v-else v-for="(item,index) in bgqData" :key="index">
                             <tr v-else v-for="(item,index) in bgqData" :key="index">
                                 <td class="xh">{{index+1}}</td>
                                 <td class="xh">{{index+1}}</td>
-                                <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td>
-                                <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td>
-                                <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td>
-                                <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td>
-                                <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td>
-                                <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
+                                <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
+                                                        readonly="readonly"/></td>
+                                <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
+                                                          readonly="readonly"/></td>
+                                <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
+                                                        readonly="readonly"/></td>
+                                <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
+                                                          readonly="readonly"/></td>
+                                <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
+                                                       readonly="readonly"/></td>
+                                <td class="zl"><input type="text" class="formInput" v-model="item.zl"
+                                                      readonly="readonly"/></td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="hbh">
+                        <span class="tips">合并后宗地信息</span>
+                        <table border="1">
+                            <tr>
+                                <th class="xzq">行政区</th>
+                                <th class="djq">地籍区</th>
+                                <th class="djzq">地籍子区</th>
+                                <th class="syqlx">所有权类型</th>
+                                <th class="tdtzm">土地特征码</th>
+                                <th class="xmmc">项目名称</th>
+                                <th class="zxx">幢信息</th>
+                            </tr>
+                            <tr>
+                                <td class="xzq">
+                                    <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
+                                        <el-option
+                                                v-for="i in xzq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="djq">
+                                    <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
+                                        <el-option
+                                                v-for="i in djq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="syqlx">
+                                    <el-select v-model="hbhData.djzqbsm">
+                                        <el-option
+                                                v-for="i in djzq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="tdtzm">
+                                    <el-select v-model="hbhData.syqlxbsm">
+                                        <el-option
+                                                v-for="i in syq"
+                                                :key="i.value"
+                                                :label="i.label"
+                                                :value="i.value"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="syqlx">
+                                    <el-select v-model="hbhData.zdtzmbsm">
+                                        <el-option
+                                                v-for="i in tdtzm"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="xmmc">
+                                    <input type="text" v-model="hbhData.xmmc" class="formInput"/>
+                                </td>
+                                <td class="zxx">
+                                    <span class="xz">选择</span>
+                                </td>
                             </tr>
                             </tr>
                         </table>
                         </table>
                     </div>
                     </div>
@@ -89,11 +237,8 @@
             <el-tab-pane label="户合并" name="h">
             <el-tab-pane label="户合并" name="h">
                 <div class="hb-tabs">
                 <div class="hb-tabs">
                     <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
                     <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
-                    <div class="header">
-                        <span>合并后项目名称</span>
-                        <el-input></el-input>
-                    </div>
-                    <div class="table">
+                    <div class="hbq">
+                        <span class="tips">合并前宗地信息</span>
                         <table border="1">
                         <table border="1">
                             <tr>
                             <tr>
                                 <td class="xh">序号</td>
                                 <td class="xh">序号</td>
@@ -111,12 +256,90 @@
                             </tr>
                             </tr>
                             <tr v-else v-for="(item,index) in bgqData" :key="index">
                             <tr v-else v-for="(item,index) in bgqData" :key="index">
                                 <td class="xh">{{index+1}}</td>
                                 <td class="xh">{{index+1}}</td>
-                                <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td>
-                                <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td>
-                                <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td>
-                                <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td>
-                                <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td>
-                                <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
+                                <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
+                                                        readonly="readonly"/></td>
+                                <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
+                                                          readonly="readonly"/></td>
+                                <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
+                                                        readonly="readonly"/></td>
+                                <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
+                                                          readonly="readonly"/></td>
+                                <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
+                                                       readonly="readonly"/></td>
+                                <td class="zl"><input type="text" class="formInput" v-model="item.zl"
+                                                      readonly="readonly"/></td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="hbh">
+                        <span class="tips">合并后宗地信息</span>
+                        <table border="1">
+                            <tr>
+                                <th class="xzq">行政区</th>
+                                <th class="djq">地籍区</th>
+                                <th class="djzq">地籍子区</th>
+                                <th class="syqlx">所有权类型</th>
+                                <th class="tdtzm">土地特征码</th>
+                                <th class="xmmc">项目名称</th>
+                                <th class="zxx">幢信息</th>
+                            </tr>
+                            <tr>
+                                <td class="xzq">
+                                    <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
+                                        <el-option
+                                                v-for="i in xzq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="djq">
+                                    <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
+                                        <el-option
+                                                v-for="i in djq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="syqlx">
+                                    <el-select v-model="hbhData.djzqbsm">
+                                        <el-option
+                                                v-for="i in djzq"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="tdtzm">
+                                    <el-select v-model="hbhData.syqlxbsm">
+                                        <el-option
+                                                v-for="i in syq"
+                                                :key="i.value"
+                                                :label="i.label"
+                                                :value="i.value"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="syqlx">
+                                    <el-select v-model="hbhData.zdtzmbsm">
+                                        <el-option
+                                                v-for="i in tdtzm"
+                                                :key="i.bsm"
+                                                :label="i.mc"
+                                                :value="i.bsm"
+                                        ></el-option>
+                                    </el-select>
+                                </td>
+                                <td class="xmmc">
+                                    <input type="text" v-model="hbhData.xmmc" class="formInput"/>
+                                </td>
+                                <td class="zxx">
+                                    <span class="xz">选择</span>
+                                </td>
                             </tr>
                             </tr>
                         </table>
                         </table>
                     </div>
                     </div>
@@ -132,28 +355,102 @@
 </template>
 </template>
 
 
 <script>
 <script>
+    import {
+        getAllList,
+        getListByXzqbsm,
+        getListByPbsm,
+        getDdicByMC
+    } from "./../../../../api/common";
     import QueryData from './../../../../components/queryData/queryData'
     import QueryData from './../../../../components/queryData/queryData'
+    import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
 
 
     export default {
     export default {
         name: "",
         name: "",
-        components: {QueryData},
+        components: {QueryData,zdQueryData},
         props: {},
         props: {},
         data() {
         data() {
             return {
             return {
                 tabName: 'zd',
                 tabName: 'zd',
                 centerDialogVisible: false,
                 centerDialogVisible: false,
                 bgqData: [],
                 bgqData: [],
-                fgBoxWidth:0
+                hbhData: {},
+                fgBoxWidth: 0,
+                xzq: [],
+                djq: [],
+                djzq: [],
+                tdtzm: [],
+                syq: [
+                    {
+                        label: "国家所有",
+                        value: "G",
+                    },
+                    {
+                        label: "集体所有",
+                        value: "J",
+                    },
+                    {
+                        label: "土地所有权未确定或有争议",
+                        value: "Z",
+                    }
+                ],
             }
             }
         },
         },
         created() {
         created() {
         },
         },
         mounted() {
         mounted() {
-            this.$nextTick(()=>{
+            this.getXzqList();
+            this.getzdtzm();
+            this.$nextTick(() => {
                 this.fgBoxWidth = this.$refs.hbBox.clientWidth;
                 this.fgBoxWidth = this.$refs.hbBox.clientWidth;
             })
             })
         },
         },
         methods: {
         methods: {
+            getzdtzm() {
+                getDdicByMC('宗地（宗海）特征码').then(res => {
+                    this.tdtzm = res.result
+                })
+            },
+            getXzqList() {
+                getAllList()
+                    .then((res) => {
+                        this.xzq = res.result;
+                    })
+                    .catch((error) => {
+                    });
+            },
+            changeXzq(id) {
+                this.djq = [];
+                this.djzq = [];
+                this.hbhData.djqbsm = ''
+                this.hbhData.djzqbsm = ''
+                getListByXzqbsm(id)
+                    .then((res) => {
+                        if (res.result == null) {
+                            this.djq = null;
+                        } else {
+                            this.djq = res.result;
+                        }
+                    })
+                    .catch((error) => {
+                    });
+            },
+            changeDjq(item) {
+                this.djzq = [];
+                this.hbhData.djzqbsm = ''
+                if (item == null) {
+                } else {
+                    getListByPbsm(item)
+                        .then((res) => {
+                            if (res.result == null) {
+                                this.djzq = null;
+                            } else {
+                                this.djzq = res.result;
+                            }
+                        })
+                        .catch((error) => {
+                        });
+                }
+            },
             handleClick(tab, event) {
             handleClick(tab, event) {
                 console.log(tab, event);
                 console.log(tab, event);
             },
             },
@@ -177,14 +474,14 @@
 </script>
 </script>
 <style scoped lang="less">
 <style scoped lang="less">
 
 
-.hb{
-    .menu{
-        /deep/.el-tabs__content{
+    .hb {
+        .menu {
+            /deep/ .el-tabs__content {
                 position: unset;
                 position: unset;
                 margin-top: 62px;
                 margin-top: 62px;
                 overflow: visible;
                 overflow: visible;
             }
             }
-         /deep/.el-tabs__header{
+            /deep/ .el-tabs__header {
                 position: -webkit-fixed;
                 position: -webkit-fixed;
                 position: fixed;
                 position: fixed;
                 top: 120px;
                 top: 120px;
@@ -192,16 +489,16 @@
                 width: 100%;
                 width: 100%;
                 margin-bottom: 0;
                 margin-bottom: 0;
                 border: 0;
                 border: 0;
-            /deep/.el-tabs__nav-scroll{
+                /deep/ .el-tabs__nav-scroll {
                     height: 50px;
                     height: 50px;
                     box-sizing: border-box;
                     box-sizing: border-box;
                     padding-left: 20px;
                     padding-left: 20px;
-                .el-tabs__active-bar{
+                    .el-tabs__active-bar {
                         display: none;
                         display: none;
                     }
                     }
-                >.el-tabs__nav{
+                    > .el-tabs__nav {
                         border: 0;
                         border: 0;
-                    >.el-tabs__item{
+                        > .el-tabs__item {
                             border: 1px solid #DEDEDE;
                             border: 1px solid #DEDEDE;
                             height: 36px;
                             height: 36px;
                             line-height: 36px;
                             line-height: 36px;
@@ -209,24 +506,25 @@
                             margin: 9px 10px 9px 0;
                             margin: 9px 10px 9px 0;
                             background-color: #ffffff;
                             background-color: #ffffff;
                         }
                         }
-                    .is-active{
+                        .is-active {
                             color: #006CFF;
                             color: #006CFF;
                             border: 1px solid #006CFF;
                             border: 1px solid #006CFF;
                         }
                         }
                     }
                     }
                 }
                 }
-            /deep/.el-tabs__nav-wrap::after{
+                /deep/ .el-tabs__nav-wrap::after {
                     width: 0;
                     width: 0;
                 }
                 }
             }
             }
         }
         }
-}
+    }
+
     .hb-tabs {
     .hb-tabs {
         height: auto;
         height: auto;
         width: 100%;
         width: 100%;
         position: relative;
         position: relative;
 
 
-        .addBtn{
+        .addBtn {
             position: absolute;
             position: absolute;
             right: 30px;
             right: 30px;
             top: -46px;
             top: -46px;
@@ -255,18 +553,14 @@
             text-align: center;
             text-align: center;
             background-color: #ffffff;
             background-color: #ffffff;
         }
         }
-        .table{
-            box-sizing: border-box;
-            padding: 0 18px;
-        }
         table {
         table {
             margin-top: 10px;
             margin-top: 10px;
             background-color: #fff;
             background-color: #fff;
             font-size: 14px;
             font-size: 14px;
             width: 100%;
             width: 100%;
-            tr:nth-of-type(odd){
+            tr:nth-of-type(odd) {
                 background: #FAFAFA;
                 background: #FAFAFA;
-                th{
+                th {
                     height: 36px;
                     height: 36px;
                 }
                 }
             }
             }
@@ -280,7 +574,7 @@
                 text-align: center;
                 text-align: center;
                 cursor: text;
                 cursor: text;
             }
             }
-            tr:hover{
+            tr:hover {
                 background-color: #F5F7FA;
                 background-color: #F5F7FA;
             }
             }
 
 
@@ -299,18 +593,34 @@
         .noData {
         .noData {
             color: #b2b2b2;
             color: #b2b2b2;
         }
         }
-        .saveBtn{
+        .saveBtn {
             background-color: #00CACD;
             background-color: #00CACD;
             border-color: #00CACD;
             border-color: #00CACD;
             padding: 10px 30px;
             padding: 10px 30px;
             margin-top: 8px;
             margin-top: 8px;
         }
         }
-        .saveBtn:hover{
+        .saveBtn:hover {
             background-color: rgba(0, 202, 205, .8);
             background-color: rgba(0, 202, 205, .8);
             border-color: rgba(0, 202, 205, .8);
             border-color: rgba(0, 202, 205, .8);
         }
         }
-        .xh{
+        .xh {
             width: 100px;
             width: 100px;
         }
         }
+        .xzq, .djq, .djzq {
+            width: 150px;
+        }
+        .tips {
+            color: #9B9B9B;
+        }
+        .hbq {
+            margin-top: 12px;
+            box-sizing: border-box;
+            padding: 18px;
+        }
+        .hbh {
+            box-sizing: border-box;
+            padding: 0 18px;
+            margin-top: 10px;
+        }
     }
     }
 </style>
 </style>

@@ -144,13 +144,13 @@ export default {
 			djq: [],
 			djq: [],
 			djzq: [],
 			djzq: [],
 			ruleForm:{
 			ruleForm:{
-				"djqbsm": "",
-				"djzqbsm": "",
-				"syqlxbsm": "",
-				"userbsm": "",
-				"xmmc": "",
-				"xzqbsm": "",
-				"zdtzmbsm": ""
+				djqbsm: "",
+				djzqbsm: "",
+				syqlxbsm: "",
+				userbsm: "",
+				xmmc: "",
+				xzqbsm: "",
+				zdtzmbsm: ""
 			},
 			},
 			ruleForm1:{
 			ruleForm1:{
 				zdbsm:'',
 				zdbsm:'',
@@ -216,6 +216,12 @@ export default {
 		this.activeName = this.auth ? 'zrz':'zd'
 		this.activeName = this.auth ? 'zrz':'zd'
 	},
 	},
 	methods: {
 	methods: {
+	    // 重置
+	    result(){
+            this.$refs['ruleForm'].resetFields()
+            this.$refs["ruleForm1"].resetFields()
+            this.$refs["ruleForm2"].resetFields()
+		},
 		handleClick(tab, event) {
 		handleClick(tab, event) {
 			console.log(tab, event);
 			console.log(tab, event);
 			console.log(tab.name);
 			console.log(tab.name);
@@ -364,6 +370,7 @@ export default {
 		},
 		},
 		close() {
 		close() {
 			this.$emit("closeDialog");
 			this.$emit("closeDialog");
+			this.result();
 		},
 		},
 	},
 	},
 	computed: {},
 	computed: {},

@@ -96,7 +96,7 @@ export default {
 				},
 				},
 				{ name: "新办房屋", img: require("../../assets/images/xbfw.png") },
 				{ name: "新办房屋", img: require("../../assets/images/xbfw.png") },
 				{ name: "重新落宗", img: require("../../assets/images/cxlz.png") },
 				{ name: "重新落宗", img: require("../../assets/images/cxlz.png") },
-				{ name: "添加", img: require("../../assets/images/cxlz.png") },
+				{ name: "添加", img: require("../../assets/images/tj.png") },
 			],
 			],
 			tableData: [],
 			tableData: [],
 			tableHeight: 0,
 			tableHeight: 0,
@@ -106,7 +106,7 @@ export default {
 	},
 	},
 	mounted() {
 	mounted() {
 		this.$nextTick(() => {
 		this.$nextTick(() => {
-			this.tableHeight = this.$refs.notice.offsetHeight - 53;
+			this.tableHeight = this.$refs.notice.offsetHeight - 54;
 		});
 		});
 	},
 	},
 	methods: {
 	methods: {
@@ -217,25 +217,27 @@ export default {
 				}
 				}
 			}
 			}
 		}
 		}
-		.el-card__body {
-			padding: 40px;
+		/deep/ .el-card__body {
+			padding: 50px 20px;
 		}
 		}
 	}
 	}
 	.notice {
 	.notice {
 		padding: 0;
 		padding: 0;
-		height: calc(100% - 225px);
+		height: calc(100% - 285px);
 		@flex();
 		@flex();
 		.news {
 		.news {
 			float: left;
 			float: left;
 			float: left;
 			float: left;
 			margin-right: 20px;
 			margin-right: 20px;
 			flex: 1;
 			flex: 1;
+			border: 1px solid #E6E6E6;
 			/deep/ .el-card__body{
 			/deep/ .el-card__body{
 				padding: 0;
 				padding: 0;
 			}
 			}
 		}
 		}
 		.download {
 		.download {
 			width: 50%;
 			width: 50%;
+			border: 1px solid #E6E6E6;
 			/deep/ .el-card__body{
 			/deep/ .el-card__body{
 				padding: 0;
 				padding: 0;
 			}
 			}

@@ -12,7 +12,7 @@
                 <el-table-column label="操作" width="100">
                 <el-table-column label="操作" width="100">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button @click="handleClick(scope.row)" type="text" size="small"
                         <el-button @click="handleClick(scope.row)" type="text" size="small"
-                        >办理
+                        >更正
                         </el-button
                         </el-button
                         >
                         >
                         <el-button type="text" size="small">定位</el-button>
                         <el-button type="text" size="small">定位</el-button>
@@ -60,7 +60,7 @@
         props: {},
         props: {},
         data() {
         data() {
             return {
             return {
-                qszt: 1,
+                qszt: ['1'],
                 total: 0,
                 total: 0,
                 pageNo: 1,
                 pageNo: 1,
                 pageSize: 10,
                 pageSize: 10,
@@ -116,44 +116,61 @@
             },
             },
             //点击办理
             //点击办理
             handleClick(row) {
             handleClick(row) {
-                console.log(row);
-                let path = "";
-                var type;
-                var id = row.bsm;
+                let type;name;
                 switch (row.dylx) {
                 switch (row.dylx) {
-                    case "自然幢":
-                        path = "/zrz";
-                        type = "1";
-                        this.$store.state.zrzbsm = row.glbsm;
-                        break;
                     case "zd":
                     case "zd":
-                        path = "/zd";
                         type = "0";
                         type = "0";
+                        name = '宗地';
                         this.$store.state.zdbsm = row.glbsm
                         this.$store.state.zdbsm = row.glbsm
                         break;
                         break;
-                    case "户":
-                        path = "h";
-                        this.$store.state.hbsm = row.glbsm
+                    case "zrz":
+                        type = "1";
+                        name = '自然幢';
+                        this.$store.state.zrzbsm = row.glbsm;
+                        break;
+                    case "h":
+                    case "h0":
+                    case "h1":
                         type = "2";
                         type = "2";
+                        name = "户"
+                        this.$store.state.hbsm = row.glbsm;
+                    case "dz":
+                        type = "3";
+                        name = "多幢";
+                        this.$store.state.dzbsm = row.glbsm;
                     default:
                     default:
                         break;
                         break;
                 }
                 }
-                var data = {"id": id, "type": type};
+                let data = {"id": row.bsm, "type": type};
+                this.$confirm('是否确定更正该'+name+'？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
                     updateQsztByBsm(data)
                     updateQsztByBsm(data)
                         .then((res => {
                         .then((res => {
                             if (res.code == 200) {
                             if (res.code == 200) {
                                 this.$message({
                                 this.$message({
-                                message: res.message,
-                                type: "success",
+                                    type: 'success',
+                                    message: '更正成功!'
                                 });
                                 });
+                                this.$router.push("/"+path);
                             } else {
                             } else {
                                 this.$message({
                                 this.$message({
                                     message: res.message,
                                     message: res.message,
                                     type: "warning",
                                     type: "warning",
                                 });
                                 });
                             }
                             }
-                    }))
-                this.$router.push(path);
+                        })).catch(() => {
+                            this.$message({
+                                message: res.message,
+                                type: "error",
+                            });
+                        });
+
+                }).catch(() => {
+
+                });
             },
             },
         },
         },
         computed: {},
         computed: {},

@@ -101,7 +101,6 @@
             //户保存
             //户保存
             hbjSaveInfo() {
             hbjSaveInfo() {
                 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
                 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
-                this.hbjVisible = false;
                 this.getData({pageSize:15});
                 this.getData({pageSize:15});
             },
             },
             //户编辑表单重置
             //户编辑表单重置

 <template>
 <template>
-  <div class="">历史回溯</div>
+  <div class="">历史回溯
+    <div id="mountNode"></div>
+  </div>
 </template>
 </template>
 
 
 <script>
 <script>
+
+  import G6 from '@antv/g6';
+  import insertCss from 'insert-css';
+  import { getLshs } from "./../../../../src/api/fwsxbg";
+
 export default {
 export default {
   name:"",
   name:"",
   components:{},
   components:{},
   props:{},
   props:{},
   data(){
   data(){
+    insertCss(`
+    .g6-tooltip {
+      border-radius: 6px;
+      font-size: 12px;
+      color: #fff;
+      background-color: #000;
+      padding: 2px 8px;
+      text-align: center;
+    }
+  `);
     return {
     return {
+      data : {}
+    }
+  },
+  created(){
+
+  },
+  mounted(){
+    this.getLshsData();
+  },
+  methods: {
+    initG6() {
+      const data = this.data;
+      G6.registerNode(
+        'sql',
+        {
+          drawShape(cfg, group) {
+            const rect = group.addShape('rect', {
+              attrs: {
+                x: -75,
+                y: -25,
+                width: 150,
+                height: 50,
+                radius: 10,
+                stroke: '#5B8FF9',
+                fill: '#C6E5FF',
+                lineWidth: 1,
+              },
+              name: 'rect-shape',
+            });
+            if (cfg.name) {
+              group.addShape('text', {
+                attrs: {
+                  text: cfg.name,
+                  x: 0,
+                  y: 0,
+                  fill: '#00287E',
+                  fontSize: 14,
+                  textAlign: 'center',
+                  textBaseline: 'middle',
+                  fontWeight: 'bold',
+                },
+                name: 'text-shape',
+              });
+            }
+            return rect;
+          },
+        },
+        'single-node',
+      );
+
+      const container = document.getElementById('mountNode');
+
+      const graph = new G6.Graph({
+        container: 'mountNode',
+        width:1000,
+        height:800,
+        layout: {
+          type: 'dagre',
+          nodesepFunc: (d) => {
+            if (d.id === '3') {
+              return 500;
+            }
+            return 50;
+          },
+          ranksep: 70,
+          controlPoints: true,
+        },
+        defaultNode: {
+          type: 'sql',
+        },
+        defaultEdge: {
+          type: 'polyline',
+          style: {
+            radius: 20,
+            offset: 45,
+            endArrow: true,
+            lineWidth: 2,
+            stroke: '#C2C8D5',
+          },
+        },
+        nodeStateStyles: {
+          selected: {
+            stroke: '#d9d9d9',
+            fill: '#5394ef',
+          },
+        },
+
+        modes: {
+          default: [
+            'drag-canvas',
+            'zoom-canvas',
+            'click-select',
+            {
+              type: 'tooltip',
+              formatText(model) {
+                const cfg = model.conf;
+                const text = [];
+                cfg.forEach((row) => {
+                  text.push(row.label + ':' + row.value + '<br>');
+                });
+                return text.join('\n');
+              },
+              offset: 30,
+            },
+          ],
+        },
+        fitView: true,
+      });
+
+      graph.data(data);
+      graph.render();
+
+      if (typeof window !== 'undefined')
+        window.onresize = () => {
+          if (!graph || graph.get('destroyed')) return;
+          if (!container || !container.scrollWidth || !container.scrollHeight) return;
+          graph.changeSize(container.scrollWidth, container.scrollHeight);
+        };
+
+    },
+
+    getLshsData(){
+      let _this = this;
+      const data = {
+        "bsm": "c0818d9e4286b35b8ee9b96d90b522aa",
+        "type": "zd"
+      };
+      getLshs(data).then((res)=>{
+        if(res.code===200){
+          _this.data=res.result;
+          this.initG6();
+        }
+      })
     }
     }
   },
   },
-  created(){},
-  mounted(){},
-  methods:{},
   computed: {},
   computed: {},
   watch: {},
   watch: {},
 }
 }
 </script>
 </script>
 <style scoped  lang="less">
 <style scoped  lang="less">
+
 </style>
 </style>
\ No newline at end of file

@@ -22,29 +22,41 @@
         </table>
         </table>
         <table border="1">
         <table border="1">
             <tr>
             <tr>
-                <td @click="addRow" class="cz">+</td>
+                <td class="cz"><el-button
+									type="primary"
+									class="changeBtn outAdd addMinus"
+									@click="addRow"
+									>+</el-button
+								></td>
                 <td class="dzwdm">定着物代码</td>
                 <td class="dzwdm">定着物代码</td>
                 <td class="syqmj">土地所有权/使用权面积(㎡)</td>
                 <td class="syqmj">土地所有权/使用权面积(㎡)</td>
                 <td class="dytdmj">独有独用土地面积(㎡)</td>
                 <td class="dytdmj">独有独用土地面积(㎡)</td>
                 <td class="fttjmj">分摊土地面积(㎡)</td>
                 <td class="fttjmj">分摊土地面积(㎡)</td>
             </tr>
             </tr>
             <tr v-for="(item,i) in mjftData.list" :key="i">
             <tr v-for="(item,i) in mjftData.list" :key="i">
-                <td @click="delRow(i)" class="cz">-</td>
+                <td class="cz">
+                    <el-button
+                        type="primary"
+                        class="changeBtn outMinus addMinus"
+                        @click="delRow(i)"
+                        >-</el-button
+                    >
+                </td>
                 <td class="dzwdm">
                 <td class="dzwdm">
-                    <el-input v-model="item.dzwdm" >
+                    <el-input v-model="item.dzwdm"  placeholder="请输入定着物代码">
                     </el-input>
                     </el-input>
                 </td>
                 </td>
                 <td class="syqmj">
                 <td class="syqmj">
-                    <el-input
-                            oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"
+                    <el-input placeholder="请输入使用所有权面积" style="ime-mode:inactive"
+                              oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                             v-model="item.tdsyqsyqmj"
                             v-model="item.tdsyqsyqmj"
                     ></el-input>
                     ></el-input>
                 </td>
                 </td>
                 <td class="dytdmj">
                 <td class="dytdmj">
-                    <el-input v-model="item.dydytdmj" oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"></el-input>
+                    <el-input v-model="item.dydytdmj" style="ime-mode:inactive" placeholder="请输入独有独用土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
                 </td>
                 </td>
                 <td class="fttjmj">
                 <td class="fttjmj">
-                    <el-input v-model="item.fttdmj" oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"></el-input>
+                    <el-input v-model="item.fttdmj" style="ime-mode:inactive" placeholder="请输入分摊土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
                 </td>
                 </td>
             </tr>
             </tr>
             <tr>
             <tr>
@@ -119,16 +131,6 @@
                     console.log(error)
                     console.log(error)
                 })
                 })
             },
             },
-            oninput(e) {
-                /*  e.target.value = (e.target.value.match(/^(1|2|3|4|5|6|7|8|9|0)*(\.?\d{0,2})/g)[0]) || null*/
-                let value = e.target.value
-                if (isNaN(value)) {
-                    value = null
-                }
-                if (value.indexOf('.') > 0) {
-                    value = value.slice(0, value.indexOf('.') + 4)
-                }
-            },
             addRow() {
             addRow() {
                 this.mjftData.list.push({
                 this.mjftData.list.push({
                     dydytdmj: '',
                     dydytdmj: '',

@@ -21,8 +21,6 @@
 				<tr>
 				<tr>
 					<td colspan="2">行政区</td>
 					<td colspan="2">行政区</td>
 					<td colspan="2">
 					<td colspan="2">
-						<el-form :rules="rules" ref="ruleForm" :inline="true" >
-							<el-form-item >
 						<el-select
 						<el-select
 								:disabled="formData.qszt!='0'"
 								:disabled="formData.qszt!='0'"
 								class="formSelect"
 								class="formSelect"
@@ -37,8 +35,6 @@
 							>
 							>
 							</el-option>
 							</el-option>
 						</el-select>
 						</el-select>
-							</el-form-item>
-						</el-form>
 					</td>
 					</td>
 					<td colspan="2">地籍区</td>
 					<td colspan="2">地籍区</td>
 					<td colspan="2">
 					<td colspan="2">
@@ -113,10 +109,10 @@
 					<td colspan="4" class="psr">
 					<td colspan="4" class="psr">
 						<input :disabled="formData.qszt!='0'"
 						<input :disabled="formData.qszt!='0'"
 							type="text" placeholder="请输入"
 							type="text" placeholder="请输入"
-							class="formInput percent78"
+							class="formInput percent80"
 							v-model="formData.zddm"
 							v-model="formData.zddm"
 						/>
 						/>
-						<el-button type="primary" class="createBtn" @click="generatorCode"
+						<el-button type="warning" class="createBtn" @click="generatorCode"
 							>生成
 							>生成
 						</el-button>
 						</el-button>
 					</td>
 					</td>
@@ -131,10 +127,10 @@
 					<td colspan="4" class="psr">
 					<td colspan="4" class="psr">
 						<input
 						<input
 							type="text" :disabled="formData.qszt!='0'"
 							type="text" :disabled="formData.qszt!='0'"
-							class="formInput percent78"
+							class="formInput percent80"
 							v-model="formData.bdcdyh"
 							v-model="formData.bdcdyh"
 						/>
 						/>
-						<el-button type="primary" class="createBtn">生成</el-button>
+						<el-button type="warning" class="createBtn">生成</el-button>
 					</td>
 					</td>
 				</tr>
 				</tr>
 				<tr>
 				<tr>
@@ -375,30 +371,30 @@ export default {
 	props: {},
 	props: {},
 	data() {
 	data() {
 		return {
 		return {
-            rules: {
-                hdmc: [
-                    { required: true, message: '请输入活动名称', trigger: 'blur' },
-                    { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-                xzq: [
-                    { required: true, message: '请选择活行政区', trigger: 'change' }
-                ],
-                date1: [
-                    { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
-                ],
-                date2: [
-                    { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
-                ],
-                type: [
-                    { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
-                ],
-                resource: [
-                    { required: true, message: '请选择活动资源', trigger: 'change' }
-                ],
-                desc: [
-                    { required: true, message: '请填写活动形式', trigger: 'blur' }
-                ]
-            },
+            // rules: {
+            //     hdmc: [
+            //         { required: true, message: '请输入活动名称', trigger: 'blur' },
+            //         { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+            //     ],
+            //     xzq: [
+            //         { required: true, message: '请选择活行政区', trigger: 'change' }
+            //     ],
+            //     date1: [
+            //         { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+            //     ],
+            //     date2: [
+            //         { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+            //     ],
+            //     type: [
+            //         { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+            //     ],
+            //     resource: [
+            //         { required: true, message: '请选择活动资源', trigger: 'change' }
+            //     ],
+            //     desc: [
+            //         { required: true, message: '请填写活动形式', trigger: 'blur' }
+            //     ]
+            // },
 			rjl:'',
 			rjl:'',
 			jzmd:'',
 			jzmd:'',
 			jzxg:'',
 			jzxg:'',
@@ -483,10 +479,9 @@ export default {
 				}
 				}
 			});
 			});
 
 
-			console.log(this.formData.syqlxbsm);
 			this.dpdm = this.dpdm + this.formData.syqlxbsm;
 			this.dpdm = this.dpdm + this.formData.syqlxbsm;
 			this.$store.state.zdtzmList.forEach((item)=>{
 			this.$store.state.zdtzmList.forEach((item)=>{
-				if(item.zdtzmbsm === this.formData.zdtzmbsm){
+				if(item.bsm === this.formData.zdtzmbsm){
 					this.dpdm = this.dpdm + item.dm;
 					this.dpdm = this.dpdm + item.dm;
 				}
 				}
 			});
 			});
@@ -567,7 +562,7 @@ export default {
                             type: "success",
                             type: "success",
                         });
                         });
                         // 保存成功再次查询
                         // 保存成功再次查询
-                        this.getZdjbxxData();
+                        this.getZdjbxxData(this.$store.state.zdbsm);
                     } else {
                     } else {
                         this.$message({
                         this.$message({
                             message: res.message,
                             message: res.message,
@@ -673,7 +668,7 @@ export default {
 			this.$store.state.zddm = val;
 			this.$store.state.zddm = val;
 		},
 		},
 		zdbsm:function (val) {
 		zdbsm:function (val) {
-			this.getZdjbxxData()
+			this.getZdjbxxData(val)
 		}
 		}
 	},
 	},
 };
 };
@@ -710,10 +705,6 @@ export default {
 			overflow: visible;
 			overflow: visible;
 			text-align: center;
 			text-align: center;
 		}
 		}
-		.percent78 {
-			width: 78%;
-			float: left;
-		}
 		.percent68 {
 		.percent68 {
 			width: 68% !important;
 			width: 68% !important;
 			float: left;
 			float: left;
@@ -734,13 +725,6 @@ export default {
 			width: 30% !important;
 			width: 30% !important;
 			float: left;
 			float: left;
 		}
 		}
-		.createBtn {
-			position: absolute;
-			width: 50px;
-			padding: 6px 4px;
-			right: 4px;
-			top: 4px;
-		}
 		.el-input__icon {
 		.el-input__icon {
 			line-height: 37px;
 			line-height: 37px;
 		}
 		}

@@ -20,9 +20,9 @@
                 <tr height="30">
                 <tr height="30">
                     <td  colspan="2" align="center"  >不动产单元号<i class="requisite">*</i></td>
                     <td  colspan="2" align="center"  >不动产单元号<i class="requisite">*</i></td>
                     <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
                     <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
-                    <td  colspan="4"  >
-                        <el-input v-model="form.bdcdyh" style="width: 82%" disabled></el-input>
-                        <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:17%;margin-left:1%">生成</el-button>
+                    <td  colspan="4" class="psr">
+                        <el-input v-model="form.bdcdyh" class="percent80" disabled></el-input>
+                        <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
                     </td>
                     </td>
                     <td  colspan="2" align="center"  >原不动产单元</td>
                     <td  colspan="2" align="center"  >原不动产单元</td>
                     <td  colspan="4"  >
                     <td  colspan="4"  >
@@ -215,12 +215,23 @@
 
 
                 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
                 <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"   id="ytTitle">
-                        <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
+                        <el-button
+                            type="primary"
+                            style="margin-right: 10px"
+                            class="changeBtn addMinus inAdd"
+                            @click="addYtInfo"
+                            >+</el-button
+                        >
                         <span>用途<i class="requisite">*</i></span>
                         <span>用途<i class="requisite">*</i></span>
                     </td>
                     </td>
 
 
                     <td width="30" colspan="1" align="center"  >
                     <td width="30" colspan="1" align="center"  >
-                        <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
+                        <el-button
+                            type="primary"
+                            class="changeBtn addMinus inMinus"
+                            @click="deleteYtInfo(index)"
+                            >-</el-button
+                        >
                         规划用途
                         规划用途
                     </td>
                     </td>
                     <td width="30" colspan="4" align="center"  >
                     <td width="30" colspan="4" align="center"  >
@@ -256,7 +267,14 @@
 
 
                 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
                 <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"  >
-                        <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
+                        <!-- <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> -->
+                        <el-button
+                            type="primary"
+                            style="margin-right: 10px"
+                            class="changeBtn addMinus inAdd"
+                            @click="addFwjgInfo"
+                            >+</el-button
+                        >
                         <span>房屋结构<i class="requisite">*</i></span>
                         <span>房屋结构<i class="requisite">*</i></span>
                     </td>
                     </td>
                     <td   colspan="1" align="center"  >
                     <td   colspan="1" align="center"  >
@@ -808,7 +826,6 @@
 
 
         td{
         td{
             //bgcolor:#F1F4FC;
             //bgcolor:#F1F4FC;
-            bgcolor:#fff;
             width:8.33%
             width:8.33%
         }
         }
 
 
@@ -824,4 +841,11 @@
     .hTable{
     .hTable{
         margin-top: 10px;
         margin-top: 10px;
     }
     }
+    
+	/deep/.el-select-tree{
+		width: 100%;
+		.el-input__inner{
+			height: 30px !important;
+		}
+	}
 </style>
 </style>
\ No newline at end of file

@@ -3,7 +3,7 @@
 		<div class="tab-header">
 		<div class="tab-header">
 			<el-row class="searchContent">
 			<el-row class="searchContent">
 				<el-col :span="8">
 				<el-col :span="8">
-					<el-radio-group v-model="tabPosition">
+					<el-radio-group  v-model="scyclx" @change="scyclxChange">
 						<el-radio-button label="1">实测</el-radio-button>
 						<el-radio-button label="1">实测</el-radio-button>
 						<el-radio-button label="0">预测</el-radio-button>
 						<el-radio-button label="0">预测</el-radio-button>
 					</el-radio-group>
 					</el-radio-group>
@@ -34,28 +34,28 @@
 							class="radioBtn"
 							class="radioBtn"
 							label="3"
 							label="3"
 							border
 							border
-							@click="plhVisible = true"
+							@click="openPl('h')"
 							>批量户</el-button
 							>批量户</el-button
 						>
 						>
 						<el-button
 						<el-button
 							class="radioBtn"
 							class="radioBtn"
 							label="4"
 							label="4"
 							border
 							border
-							@click="plcVisible = true"
+							@click="openPlC"
 							>批量层</el-button
 							>批量层</el-button
 						>
 						>
 						<el-button
 						<el-button
 							class="radioBtn"
 							class="radioBtn"
 							label="5"
 							label="5"
 							border
 							border
-							@click="plShVisible = true"
+							@click="openPl('sh')"
 							>批量室号</el-button
 							>批量室号</el-button
 						>
 						>
 						<el-button
 						<el-button
 							class="radioBtn"
 							class="radioBtn"
 							label="6"
 							label="6"
 							border
 							border
-							@click="plzlVisible = true"
+							@click="openPl('zl')"
 							>批量坐落</el-button
 							>批量坐落</el-button
 						>
 						>
 						<el-button class="radioBtn" label="7" border @click="addBdcdyh"
 						<el-button class="radioBtn" label="7" border @click="addBdcdyh"
@@ -236,10 +236,10 @@
 			</div>
 			</div>
 		</el-dialog>
 		</el-dialog>
 		<!-- 批量操作弹出框 -->
 		<!-- 批量操作弹出框 -->
-		<pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose"></pl-h>
-		<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose"></pl-zl>
-		<pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c>
-		<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh>
+		<pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose" @lodding="lodding"></pl-h>
+		<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
+		<pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
+		<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
 		<h-cxlz
 		<h-cxlz
 			:h-cxlz-visble="hcxlzVisible"
 			:h-cxlz-visble="hcxlzVisible"
 			:bsms="bsms"
 			:bsms="bsms"
@@ -258,6 +258,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import {Message} from "element-ui"
 import HCxlz from "./../../../../components/hCxlz/hCxlz";
 import HCxlz from "./../../../../components/hCxlz/hCxlz";
 import PlC from "./../../../../components/plc/plC";
 import PlC from "./../../../../components/plc/plC";
 import PlSh from "./../../../../components/plsh/plSh";
 import PlSh from "./../../../../components/plsh/plSh";
@@ -289,7 +290,7 @@ export default {
 	props: {},
 	props: {},
 	data() {
 	data() {
 		return {
 		return {
-			bsms: ["123", "321", "231"],
+			bsms: [],
 			hbsm: "",
 			hbsm: "",
 			dialogVisible: false,
 			dialogVisible: false,
 			plcVisible: false,
 			plcVisible: false,
@@ -298,7 +299,7 @@ export default {
 			plzlVisible: false,
 			plzlVisible: false,
 			hbjVisible: false,
 			hbjVisible: false,
 			hcxlzVisible:false,
 			hcxlzVisible:false,
-			tabPosition: "1", //1是实测  0是预测
+			scyclx: "1", //1是实测  0是预测
 			radio1: "",
 			radio1: "",
 			radio2: "",
 			radio2: "",
 			createFlag: false,
 			createFlag: false,
@@ -372,6 +373,7 @@ export default {
 			lpbContentwidth: "",
 			lpbContentwidth: "",
 			time: "",
 			time: "",
 			dyztBsmList: {}, //单元状态bsmList
 			dyztBsmList: {}, //单元状态bsmList
+			cbsmList:[], // 层bsmlist
 		};
 		};
 	},
 	},
 	created() {
 	created() {
@@ -391,6 +393,35 @@ export default {
 		}, 100);
 		}, 100);
 	},
 	},
 	methods: {
 	methods: {
+        openPlC(){
+            if (this.cbsmList.length <= 0) {
+                Message.warning("请选择层")
+            	return
+            }
+            this.plcVisible=true
+		},
+        openPl(val){
+            if (this.bsms.length <= 0) {
+                Message.warning("请选择操作户")
+                return
+            }
+            switch (val) {
+                case 'h':
+                    this.plhVisible=true;
+                    break;
+                case 'zl':
+                    this.plzlVisible=true;
+                    break;
+                case 'sh':
+                    this.plShVisible=true;
+                    break;
+                default:
+                    break;
+            }
+        },
+	    lodding(){
+            this.getlpbData();
+		},
 		hcxlzClose() {
 		hcxlzClose() {
 			this.hcxlzVisible = false;
 			this.hcxlzVisible = false;
 		},
 		},
@@ -406,6 +437,18 @@ export default {
 		plshClose() {
 		plshClose() {
 			this.plShVisible = false;
 			this.plShVisible = false;
 		},
 		},
+		//改变是预测数据类型
+		scyclxChange(val){
+			//清空已选中层户
+			this.cbsmList = [];
+			this.bsms = [];
+			console.log(this.$refs.lpbContent.$refs.hBsm,'this.$refs.lpbContent');
+			this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
+					if (item.className == "tdSelect") {
+						item.className = "";
+					}
+			})
+		},
 		//获取高度计算lpb内容区高度
 		//获取高度计算lpb内容区高度
 		getHeight() {
 		getHeight() {
 			this.lpbContentHight = window.innerHeight - 285;
 			this.lpbContentHight = window.innerHeight - 285;
@@ -484,6 +527,11 @@ export default {
 			}
 			}
 			console.log(this.bsms);
 			console.log(this.bsms);
 		},
 		},
+		//获取选中层bsmlist
+		getCbsm(data){
+			this.cbsmList = data;
+			console.log(this.cbsmList);
+		},
 		//不动产单元号输入框事件
 		//不动产单元号输入框事件
 		inputFocus() {
 		inputFocus() {
 			this.inputWidth = 200;
 			this.inputWidth = 200;
@@ -554,7 +602,7 @@ export default {
 		getDyztBsmList() {
 		getDyztBsmList() {
 			let data = {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
 				zrzbsm: this.$store.state.zrzbsm,
-				syclx: "0",
+				scyclx: "0",
 			};
 			};
 			getLpbTj(data).then((res) => {
 			getLpbTj(data).then((res) => {
 				if (res.code === 200) {
 				if (res.code === 200) {
@@ -603,7 +651,7 @@ export default {
 		getLpbFwytAndQlxz(){
 		getLpbFwytAndQlxz(){
 			let data = {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
 				zrzbsm: this.$store.state.zrzbsm,
-				syclx: "0",
+				scyclx: "0",
 			};
 			};
 			getLpbFwytAndQlxz(data).then((res) => {
 			getLpbFwytAndQlxz(data).then((res) => {
 				if (res.code === 200) {
 				if (res.code === 200) {

@@ -30,13 +30,13 @@
 							<el-input v-model="form.ljzmc"></el-input>
 							<el-input v-model="form.ljzmc"></el-input>
 						</td>
 						</td>
 						<td colspan="2" align="center">不动产单元号</td>
 						<td colspan="2" align="center">不动产单元号</td>
-						<td colspan="4">
-							<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
+						<td colspan="4" class="psr">
+							<el-input v-model="form.bdcdyh" class="percent80"></el-input>
 							<el-button
 							<el-button
 								@click.prevent=""
 								@click.prevent=""
 								size="mini"
 								size="mini"
-								type="primary"
-								style="width:25%;margin-left:3%"
+								type="warning"
+								class="createBtn"
 								>生成</el-button
 								>生成</el-button
 							>
 							>
 						</td>
 						</td>

 <template>
 <template>
 	<div class="lpbContent-wrap"  ref="lpbContentWrap">
 	<div class="lpbContent-wrap"  ref="lpbContentWrap">
-		<div class="lpbContent"  ref="lpbContent" v-loading='loading'>
+		<div :class="lpbData.ljzs.length == 0 ? 'column-reverse lpbContent':'lpbContent'" ref="lpbContent" v-loading='loading'>
 			<div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'"  :style="{'width':ljzWidth+'px'}" v-show="lpbData.ljzs.length>0">
 			<div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'"  :style="{'width':ljzWidth+'px'}" v-show="lpbData.ljzs.length>0">
 				<!-- 循环逻辑幢数据 -->
 				<!-- 循环逻辑幢数据 -->
 				<div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex">
 				<div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex">
@@ -12,7 +12,7 @@
 								<table  class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}"  border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
 								<table  class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}"  border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
 									<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
 									<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
 										<!-- 显示层数 -->
 										<!-- 显示层数 -->
-										<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td>
+										<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
 										<!-- 显示户 -->
 										<!-- 显示户 -->
 										<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 										<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 									</tr>
 									</tr>
@@ -25,10 +25,10 @@
 						</div>
 						</div>
 						<!-- 循环逻辑幢下的层户 -->
 						<!-- 循环逻辑幢下的层户 -->
 						<div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}"  v-if="ljzs.cs.length>0">
 						<div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}"  v-if="ljzs.cs.length>0">
-							<table  class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0">
+							<table  class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)<0? 0:(ljzzdyHeight+40-1-ljzs.cs.length*65) +'px'}"  border="1" cellspacing="0" cellpadding="0">
 								<tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
 								<tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
 									<!-- 显示层数 -->
 									<!-- 显示层数 -->
-									<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td>
+									<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
 									<!-- 显示户 -->
 									<!-- 显示户 -->
 									<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 									<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 								</tr>
 								</tr>
@@ -53,7 +53,7 @@
 					<table  class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
 					<table  class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
 						<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
 						<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
 							<!-- 显示层数 -->
 							<!-- 显示层数 -->
-							<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td>
+							<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
 							<!-- 显示户 -->
 							<!-- 显示户 -->
 							<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)"  @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 							<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)"  @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 						</tr>
 						</tr>
@@ -65,7 +65,7 @@
 					<table  class="chTable" ref="ch" border="1"  cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" >
 					<table  class="chTable" ref="ch" border="1"  cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" >
 						<tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex">
 						<tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex">
 							<!-- 显示层数 -->
 							<!-- 显示层数 -->
-							<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td>
+							<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
 							<!-- 显示户 -->
 							<!-- 显示户 -->
 							<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)"  @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 							<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)"  @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
 						</tr>
 						</tr>
@@ -90,19 +90,41 @@
 			<li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li>
 			<li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li>
 			<li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li>
 			<li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li>
 			<li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li>
 			<li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li>
-			<li v-show='rightClickFlag=="c"' @click="handleAddC">添加</li>
-			<li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除</li>
+			<li v-show='rightClickFlag=="c"' @click="handleAddC('up')">向上添加层</li>
+			<li v-show='rightClickFlag=="c"' @click="handleAddC('down')">向下添加层</li>
+			<li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除层</li>
 		</ul>
 		</ul>
+		<!-- 层操作弹框 -->
+		<el-dialog :title="addCData.title" :visible.sync="addCVisible" width="50%" center>
+			 <el-form :model="addCData">
+				<el-form-item label="层号" :label-width="formLabelWidth">
+					<el-input disabled v-model="addCData.sjc" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="实际层" :label-width="formLabelWidth">
+					<el-input disabled v-model="addCData.sjc" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="添加的户数" :label-width="formLabelWidth">
+					<el-input v-model="addCData.hcount" autocomplete="off"></el-input>
+				</el-form-item>
+			</el-form>
+			<div class="btnGroup">
+				<el-button type="primary" @click="saveAddC">保存</el-button>
+				<el-button type="primary" @click="addCVisible = false">取消</el-button>
+			</div>
+		</el-dialog>
+		<move-h :hbsm="chData.bsm" @close="moveHClose" :move-hvisible="moveHvisible" :type="scyclx" @loading="loadingData"></move-h>
 	</div>
 	</div>
 </template>
 </template>
 <script>
 <script>
-import { getLpb } from "../../../../../api/lpb";
+import moveH from "./../../../../../components/moveH/moveH"
+import { getLpb,insertUpDownC,deleteCByBsm } from "../../../../../api/lpb";
 export default {
 export default {
 	name: "",
 	name: "",
-	components: {},
+	components: {moveH},
 	props: {},
 	props: {},
 	data() {
 	data() {
 		return {
 		return {
+            moveHvisible:false,
 			lpbData: {
 			lpbData: {
 				ljzs: [],
 				ljzs: [],
 				cs: [],
 				cs: [],
@@ -117,6 +139,7 @@ export default {
 			ljzzdyHeight: 0, //逻辑幢下幢单元的div高度
 			ljzzdyHeight: 0, //逻辑幢下幢单元的div高度
 			loading: true,
 			loading: true,
 			hbsmList: [],
 			hbsmList: [],
+			cbsmList:[],
 			time: null, //区分单双击事件的定时器
 			time: null, //区分单双击事件的定时器
 			searchNum: Math.random(),
 			searchNum: Math.random(),
 			//接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList
 			//接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList
@@ -126,12 +149,22 @@ export default {
 			lpbChTop:100,
 			lpbChTop:100,
 			//右键层户数据
 			//右键层户数据
 			chData:'',
 			chData:'',
-			rightClickFlag:""
+			rightClickFlag:"",
+			//层操作数据
+			addCVisible:false,
+			addCData:{
+				title:"",
+				cbsm:"",//层标识码
+				hcount:"",//添加户数
+				scyclx:"",//实测预测类型
+				sjc:"", //当前的层的SJC +1
+			},
+			formLabelWidth: '120px'
 		};
 		};
 	},
 	},
 	created() {},
 	created() {},
 	mounted() {
 	mounted() {
-		this.getLpb(this.$store.state.zrzbsm);
+		this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
 		setTimeout(() => {
 		setTimeout(() => {
 			//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
 			//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
 			this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
 			this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
@@ -143,16 +176,19 @@ export default {
 		}, 200);
 		}, 200);
 	},
 	},
 	methods: {
 	methods: {
+        loadingData(){
+            this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
+		},
 		//获取楼盘表数据
 		//获取楼盘表数据
-		getLpb(zrzbsm) {
-			getLpb(zrzbsm).then((res) => {
+		getLpb(zrzbsm,scyclx) {
+			getLpb(zrzbsm,scyclx).then((res) => {
 				if (res.code == 200) {
 				if (res.code == 200) {
 					this.loading = false;
 					this.loading = false;
 					this.lpbData = res.result == null ? this.lpbData : res.result;
 					this.lpbData = res.result == null ? this.lpbData : res.result;
-					setTimeout(() => {
+					this.$nextTick(()=>{
 						//渲染楼盘表
 						//渲染楼盘表
 						this.dataChange();
 						this.dataChange();
-					}, 200);
+					})
 				} else {
 				} else {
 					this.$message({
 					this.$message({
 						message: res.message,
 						message: res.message,
@@ -171,12 +207,13 @@ export default {
 		//自然幢下元素高度宽度计算
 		//自然幢下元素高度宽度计算
 		dataChange() {
 		dataChange() {
 			//计算逻辑幢宽度  20为marginRight值
 			//计算逻辑幢宽度  20为marginRight值
-			this.ljzWidth -= 9980;
+			this.ljzWidth = 20;
 			if (this.$refs.ljz != undefined) {
 			if (this.$refs.ljz != undefined) {
 				this.$refs.ljz.forEach((item) => {
 				this.$refs.ljz.forEach((item) => {
 					this.ljzWidth += item.offsetWidth + 20;
 					this.ljzWidth += item.offsetWidth + 20;
 				});
 				});
 			} else {
 			} else {
+
 			}
 			}
 			//计算独立幢单元和独立层户宽度
 			//计算独立幢单元和独立层户宽度
 			//考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
 			//考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
@@ -185,7 +222,7 @@ export default {
 				let higher = true;
 				let higher = true;
 				//记录最高的幢单元高度 默认为第一个幢单元高度
 				//记录最高的幢单元高度 默认为第一个幢单元高度
 				let highest = this.$refs.zdy[0].offsetHeight;
 				let highest = this.$refs.zdy[0].offsetHeight;
-				this.zdyWidth -= 980;
+				this.zdyWidth = 20;
 				this.$refs.zdy.forEach((item) => {
 				this.$refs.zdy.forEach((item) => {
 					this.zdyWidth += item.offsetWidth + 21;
 					this.zdyWidth += item.offsetWidth + 21;
 					this.cHeight =
 					this.cHeight =
@@ -197,9 +234,11 @@ export default {
 					//计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
 					//计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
 					higher = highest > this.$refs.ch.offsetHeight ? true : false;
 					higher = highest > this.$refs.ch.offsetHeight ? true : false;
 					this.zdyHeight = higher ? highest : this.$refs.ch.offsetHeight;
 					this.zdyHeight = higher ? highest : this.$refs.ch.offsetHeight;
+					highest = 0;
 					this.zdyWidth += this.$refs.ch.offsetWidth;
 					this.zdyWidth += this.$refs.ch.offsetWidth;
 				} else {
 				} else {
 					this.zdyHeight = highest;
 					this.zdyHeight = highest;
+					highest = 0;
 				}
 				}
 			} else {
 			} else {
 				// this.zdyWidth = 124;
 				// this.zdyWidth = 124;
@@ -222,13 +261,21 @@ export default {
 				if (this.$refs.ljzch != undefined) {
 				if (this.$refs.ljzch != undefined) {
 					//计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
 					//计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
 					higher = highest > this.$refs.ljzch.offsetHeight ? true : false;
 					higher = highest > this.$refs.ljzch.offsetHeight ? true : false;
+					this.$nextTick(()=>{
 						this.ljzzdyHeight = higher ? highest : this.$refs.ljzch.offsetHeight;
 						this.ljzzdyHeight = higher ? highest : this.$refs.ljzch.offsetHeight;
+						highest = 0;
+					})
 				} else {
 				} else {
+					this.$nextTick(()=>{
 						this.ljzzdyHeight = highest;
 						this.ljzzdyHeight = highest;
+						highest = 0;
+					})
 				}
 				}
 			} else {
 			} else {
 				// this.zdyWidth = 124;
 				// this.zdyWidth = 124;
 			}
 			}
+
+
 		},
 		},
 		//户单击事件
 		//户单击事件
 		handleTdClick(e, bsm) {
 		handleTdClick(e, bsm) {
@@ -285,6 +332,20 @@ export default {
 			this.rightClickFlag = type;
 			this.rightClickFlag = type;
 			this.lpbChVisible = true;
 			this.lpbChVisible = true;
 		},
 		},
+		// 层选中事件
+		handleClickC(e,item){
+			//判断点击的层是否选中
+			if (e.target.className.indexOf("tdSelect") == -1) {
+				//未选中→选中
+				e.target.className += " tdSelect"; //加边框
+				this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList
+			} else {
+				//选中→未选中
+				e.target.className = "floor";
+				this.deleteArrOption(this.cbsmList,item.bsm);
+			}
+			this.$parent.getCbsm(this.cbsmList);
+		},
 		//关闭右键菜单
 		//关闭右键菜单
 		closeMenu(){
 		closeMenu(){
 			this.lpbChVisible = false
 			this.lpbChVisible = false
@@ -294,7 +355,13 @@ export default {
 
 
 		},
 		},
 		handleMoveH(){
 		handleMoveH(){
-
+            // 移动户
+			console.log(this.chData,"chData")
+			console.log(this.$parent.scyclx,"实预测类型")
+            this.moveHvisible=true;
+        },
+        moveHClose(){
+            this.moveHvisible=false;
 		},
 		},
 		handleDeleteH(){
 		handleDeleteH(){
 
 
@@ -304,12 +371,62 @@ export default {
 		},
 		},
 		//end
 		//end
 		// 层右键菜单 start
 		// 层右键菜单 start
-		handleAddC(){
-
+		//添加
+		handleAddC(type){
+			this.addCData.title = type == "up" ? "向上添加层" : "向下添加层";
+			this.addCVisible = true;
+			this.addCData.sjc = type == "up" ? Number(this.chData.sjc) + 1 : Number(this.chData.sjc) - 1;
+			this.addCData.cbsm = this.chData.bsm;
+			this.addCData.scyclx = this.$parent.scyclx;
 		},
 		},
+		//删除
 		handleDeleteC(){
 		handleDeleteC(){
+			let params = {
+				cbsm:this.chData.bsm,
+				scyclx:this.$parent.scyclx
+			}
+			this.$confirm('是否确认删除该层?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				deleteCByBsm(params).then((res) => {
+					if (res.code == 200) {
+						this.$message({
+							message: "删除成功",
+							type: "success",
+						});
+						this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
+					}else{
+						this.$message({
+							message: res.message,
+							type: "warning",
+						});
+					}
+				});
+			}).catch(() => {
+
+			});
 
 
 		},
 		},
+		//确认添加
+		saveAddC(){
+			insertUpDownC(this.addCData).then((res) => {
+				if (res.code == 200) {
+					this.$message({
+						message: "添加成功",
+						type: "success",
+					});
+					this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
+					this.addCVisible = false;
+				}else{
+					this.$message({
+						message: res.message,
+						type: "warning",
+					});
+				}
+			});
+		},
 		//end
 		//end
 	},
 	},
 	computed: {
 	computed: {
@@ -319,8 +436,14 @@ export default {
 		legendToggleFlagChange() {
 		legendToggleFlagChange() {
 			return this.$parent.legendToggleFlag;
 			return this.$parent.legendToggleFlag;
 		},
 		},
+		scyclx(){
+			return this.$parent.scyclx
+		}
 	},
 	},
 	watch: {
 	watch: {
+		scyclx(n){
+			this.getLpb(this.$store.state.zrzbsm,n)
+		},
 		createFlagChange: function(val) {
 		createFlagChange: function(val) {
 			setTimeout(() => {
 			setTimeout(() => {
 				this.lpbContentWidth = this.$refs.lpbContent.offsetWidth - 6;
 				this.lpbContentWidth = this.$refs.lpbContent.offsetWidth - 6;
@@ -474,7 +597,7 @@ export default {
 					background-color: blanchedalmond;
 					background-color: blanchedalmond;
 				}
 				}
 				td {
 				td {
-					width: 124px;
+					min-width: 124px;
 					height: 64px;
 					height: 64px;
 					line-height: 64px;
 					line-height: 64px;
 					text-align: center;
 					text-align: center;
@@ -485,15 +608,21 @@ export default {
 					background-image: url("../../../../../assets/tdSelect.png");
 					background-image: url("../../../../../assets/tdSelect.png");
 					background-repeat: no-repeat;
 					background-repeat: no-repeat;
 					background-position: right top;
 					background-position: right top;
+					background-size: 30px;
 				}
 				}
 			}
 			}
 		}
 		}
 		.name {
 		.name {
 			line-height: 40px;
 			line-height: 40px;
 			text-align: center;
 			text-align: center;
+			display: inline-block;
 		}
 		}
 		// end
 		// end
 	}
 	}
+	.column-reverse {
+		display: flex;
+		flex-direction: column-reverse;
+	}
 	.zrz {
 	.zrz {
 		height: 60px;
 		height: 60px;
 		line-height: 60px;
 		line-height: 60px;
@@ -503,5 +632,10 @@ export default {
 		text-align: center;
 		text-align: center;
 		transition: 0.5s;
 		transition: 0.5s;
 	}
 	}
+
+	.btnGroup {
+		margin: 20px auto 0;
+		width: 150px;
+	}
 }
 }
 </style>
 </style>

@@ -44,6 +44,7 @@ export default {
     height: 100%;
     height: 100%;
     box-sizing: border-box;
     box-sizing: border-box;
     padding:18px;
     padding:18px;
+    padding-bottom: 0;
 		-webkit-user-select:none;
 		-webkit-user-select:none;
 		-moz-user-select:none;
 		-moz-user-select:none;
 		-ms-user-select:none;
 		-ms-user-select:none;

@@ -13,7 +13,14 @@
             </table>
             </table>
             <table border="1">
             <table border="1">
                 <tr>
                 <tr>
-                    <td @click="addRow">+</td>
+                    <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>
@@ -22,13 +29,20 @@
                     <td>附记</td>
                     <td>附记</td>
                 </tr>
                 </tr>
                 <tr v-for="(item,i) in Data.list" :key="i">
                 <tr v-for="(item,i) in Data.list" :key="i">
-                    <td @click="delRow(i)">-</td>
-                    <td><input type="text" class="formInput" v-model="item.jgzwbh"/></td>
-                    <td><input type="number" class="formInput" v-model="item.jgzsl" @keydown="oninput"/></td>
-                    <td><input type="number" class="formInput" v-model.number="item.jgzmj" @keydown="oninput"/></td>
-                    <td><input type="number" class="formInput" v-model.number="item.zdmj" @keydown="oninput"/></td>
-                    <td><input type="number" class="formInput" v-model.number="item.fttdmj" @keydown="oninput"/></td>
-                    <td><input type="text" class="formInput" v-model="item.fj"/></td>
+                    <td>
+                        <el-button
+                            type="primary"
+                            class="changeBtn outMinus addMinus"
+                            @click="delRow(i)"
+                            >-</el-button
+                        >
+                    </td>
+                    <td><el-input  v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td>
+                    <td><el-input  v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td>
+                    <td><el-input  v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td>
+                    <td><el-input  v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td>
+                    <td><el-input  v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td>
+                    <td><el-input  v-model="item.fj" placeholder="请输入附记"></el-input></td>
                 </tr>
                 </tr>
                 <!--   <tr>
                 <!--   <tr>
                        <td>统计</td>
                        <td>统计</td>
@@ -94,9 +108,6 @@
                     }
                     }
                 })
                 })
             },
             },
-            oninput(e) {
-                e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
-            },
             addRow() {
             addRow() {
                 this.Data.list.push({
                 this.Data.list.push({
                     jgzwbh: '',  // 建(构)筑物编号
                     jgzwbh: '',  // 建(构)筑物编号

@@ -13,19 +13,19 @@
                         <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
                         <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
                     </td>
                     </td>
                     <td colspan="2" >自然幢号<i class="requisite">*</i></td>
                     <td colspan="2" >自然幢号<i class="requisite">*</i></td>
-                    <td colspan="4"  >
-                        <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh">
+                    <td colspan="4" class="psr">
+                        <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh">
+                        <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
                     </td>
                     </td>
                 </tr>
                 </tr>
                 <tr>
                 <tr>
                     <td colspan="2" >项目名称<i class="requisite">*</i></td>
                     <td colspan="2" >项目名称<i class="requisite">*</i></td>
                     <td colspan="4"  >
                     <td colspan="4"  >
-                        <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc">
+                        <input class="formInput " :disabled="form.qszt!='0'" v-model="form.xmmc">
                     </td>
                     </td>
                     <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
                     <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
-                    <td colspan="4"  >
-                        <input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%">
-                        <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
+                    <td colspan="4">
+                        <input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh">
                     </td>
                     </td>
                 </tr>
                 </tr>
 
 
@@ -145,12 +145,12 @@
 
 
                 <tr v-for="(item1,index) in form.fwytList" :key="index">
                 <tr v-for="(item1,index) in form.fwytList" :key="index">
                     <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan"  id="ytTitle">
                     <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan"  id="ytTitle">
-                        <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
-                        <span>用途<i class="requisite">*</i></span>
+                        <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button>
+                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;用途<i class="requisite">*</i></span>
                     </td>
                     </td>
 
 
                     <td  colspan="1" style="min-width:120px">
                     <td  colspan="1" style="min-width:120px">
-                        <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
+                        <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
                         规划用途
                         规划用途
                     </td>
                     </td>
                     <td colspan="3" >
                     <td colspan="3" >
@@ -186,11 +186,12 @@
 
 
                 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
                 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
                     <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" >
                     <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" >
-                        <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
+                        <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
                         <span>房屋结构<i class="requisite">*</i></span>
                         <span>房屋结构<i class="requisite">*</i></span>
                     </td>
                     </td>
                     <td colspan="1" >
                     <td colspan="1" >
-                        <span @click="deleteFwjgInfo(index)">删除</span>
+                        <el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
+                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
                     </td>
                     </td>
                     <td colspan="9"  >
                     <td colspan="9"  >
                         <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
                         <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
@@ -205,13 +206,10 @@
                 </tr>
                 </tr>
 
 
                 <tr>
                 <tr>
-                    <td colspan="12" rowspan="4" align="center">
+                    <td colspan="12" align="center">
                         <Qlxz ref="qlxzModule" :formData="form"></Qlxz>
                         <Qlxz ref="qlxzModule" :formData="form"></Qlxz>
                     </td>
                     </td>
                 </tr>
                 </tr>
-                <tr></tr>
-                <tr></tr>
-                <tr></tr>
 
 
                 <tr>
                 <tr>
                     <td colspan="2" >
                     <td colspan="2" >
@@ -274,7 +272,7 @@
 
 
 <script>
 <script>
     import Qlr from "../../../components/formMenu/qlr";
     import Qlr from "../../../components/formMenu/qlr";
-    import Qlxz from "../../../components/formMenu/qlxz";
+    import Qlxz from "../../../components/formMenu/qlxz_simple";
     import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
     import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
     import {getQjZdjbxxDetailById} from "../../../api/zd"
     import {getQjZdjbxxDetailById} from "../../../api/zd"
     import {submit} from "../../../api/common"
     import {submit} from "../../../api/common"
@@ -605,10 +603,6 @@
 			text-align: center;
 			text-align: center;
 			cursor: text;
 			cursor: text;
 		}
 		}
-		.percent78 {
-			width: 78%;
-			float: left;
-		}
 		.percent68 {
 		.percent68 {
 			width: 68% !important;
 			width: 68% !important;
 			float: left;
 			float: left;
@@ -629,13 +623,6 @@
 			width: 30% !important;
 			width: 30% !important;
 			float: left;
 			float: left;
 		}
 		}
-		.createBtn {
-			position: absolute;
-			width: 50px;
-			padding: 6px 4px;
-			right: 4px;
-			top: 4px;
-		}
 		.el-input__icon {
 		.el-input__icon {
 			line-height: 37px;
 			line-height: 37px;
 		}
 		}