Merge remote-tracking branch 'origin/master'

@@ -66,8 +66,18 @@ export function batchScYcChange (data) {
         data:data
         data:data
     })
     })
 }
 }
-
-
+/**
+ * 楼盘表 获取单元状态统计数据
+ * zrzbsm 自然幢标识码 ,
+ * scyclx 实测预测类型   0预测，1实测
+ */
+export function getLpbTj (data) {
+    return request({
+        url: 'fw/lpb/getLpbTj?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx,
+        method: 'get',
+        data:data
+    })
+}
 
 
 /**
 /**
  * 楼盘表 批量不动产单元号生成
  * 楼盘表 批量不动产单元号生成

@@ -150,7 +150,7 @@ export function jzxsbatchModify(data) {
  */
  */
 export function deleteZdInfoByBsm(data) {
 export function deleteZdInfoByBsm(data) {
     return request({
     return request({
-        url: '/zd/qjZdjbxx/deleteZdjbxxByBsm',
+        url: '/delete/deleteDyByBsm',
         method: 'delete',
         method: 'delete',
         data: data
         data: data
     })
     })
@@ -161,10 +161,32 @@ export function deleteZdInfoByBsm(data) {
  */
  */
 export function zdfg(data) {
 export function zdfg(data) {
     return request({
     return request({
-        url: '/fg/zdFg',
+        url: '/bg/zdSplitMerge/zdFg',
         method: 'post',
         method: 'post',
         data: data
         data: data
     })
     })
 }
 }
 
 
+/**
+ * 获取宗地下的自然幢、逻辑幢、幢单元
+ */
+export function zdXlcd(bsm) {
+    return request({
+        url:'/zd/qjZdjbxx/parcels',
+        method:'get',
+        params:{
+            bsm
+        }
+    })
+}
 
 
+/**
+ * 户落宗
+ */
+export function hzl(data) {
+    return request({
+        url:'/system/qjH/hcxlz',
+        method:'put',
+        data:data
+    })
+}

@@ -31,6 +31,9 @@
 .fr{
 .fr{
     float: right;
     float: right;
 }
 }
+.tac{
+    text-align: center!important;
+}
 table{
 table{
     border-width: 0;
     border-width: 0;
 }
 }

@@ -222,23 +222,23 @@ export default {
 		},
 		},
 		//右键菜单的删除
 		//右键菜单的删除
 		deleteByBsm(){
 		deleteByBsm(){
-			let zdBsm = this.zdData.zdbsm;
-			let type;
-			console.log(zdBsm);
-			switch (this.zdData.type){
-				case "zd":
-					type="0";
-					break;
-				case "zrz":
-					type="1";
-					break;
-				case "h":
-					type="2";
-					break;
-				default:
-					break;
-			}
-			let params={"id":zdBsm,"type":type}
+			//let zdBsm = this.zdData.zdbsm;
+			//let type;
+			console.log(this.zdData.zdbsm);
+			//switch (this.zdData.type){
+			//	case "zd":
+			//		type="0";
+			//		break;
+			//	case "zrz":
+			//		type="1";
+			//		break;
+			//	case "h":
+			//		type="2";
+			//		break;
+			//	default:
+			//		break;
+			//}
+			let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}
 			deleteZdInfoByBsm(params)
 			deleteZdInfoByBsm(params)
 				.then((res) => {
 				.then((res) => {
 					if(res.code=200){
 					if(res.code=200){

@@ -79,6 +79,16 @@
             </div>
             </div>
             <span slot="footer" class="dialog-footer">
             <span slot="footer" class="dialog-footer">
               </span>
               </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>
         </el-dialog>
 
 
     </div>
     </div>
@@ -91,6 +101,7 @@
         name: "queryData",
         name: "queryData",
         data() {
         data() {
             return {
             return {
+                total:1,
                 queryData: {
                 queryData: {
                     bdcdyh: "",
                     bdcdyh: "",
                     bdcqzh: "",
                     bdcqzh: "",
@@ -99,7 +110,9 @@
                     qszt: "2",
                     qszt: "2",
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
-                    zl: ""
+                    zl: "",
+                    pageNo: 1,
+                    pageSize: 10,
                 },
                 },
                 Data: [],
                 Data: [],
                 isVisible: false
                 isVisible: false
@@ -125,6 +138,10 @@
         created() {
         created() {
         },
         },
         methods: {
         methods: {
+            currentChange: function (val) {
+                this.queryData.pageNo = val;
+                this.getData(this.queryData);
+            },
             result: function () {
             result: function () {
                 this.queryData = {
                 this.queryData = {
                     bdcdyh: "",
                     bdcdyh: "",
@@ -133,7 +150,9 @@
                     qszt: "2",
                     qszt: "2",
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
-                    zl: ""
+                    zl: "",
+                    pageNo: 1,
+                    pageSize: 10
                 };
                 };
                 this.getData(this.queryData)
                 this.getData(this.queryData)
             },
             },
@@ -141,6 +160,7 @@
                 data['dylxs'] = this.dylxs;
                 data['dylxs'] = this.dylxs;
                 getSearchList(data).then(res => {
                 getSearchList(data).then(res => {
                     this.Data = res.result.records
                     this.Data = res.result.records
+                    this.total = res.result.total;
                 })
                 })
             },
             },
             search: function () {
             search: function () {
@@ -151,7 +171,7 @@
             },
             },
             close: function () {
             close: function () {
                 this.$emit('close')
                 this.$emit('close')
-                this.isVisible = false
+                this.result();
             }
             }
         },
         },
         watch: {
         watch: {