feat(dzhb):多幢合并

@@ -249,3 +249,13 @@ export function ZdHb(data) {
     })
     })
 }
 }
 
 
+/**
+ * 多幢合并
+ */
+export function dzHb(data) {
+    return request({
+        url:"/bg/dzSplitMerge/dzHb",
+        method:'post',
+        data:data
+    })
+}

@@ -42,7 +42,7 @@
                     <td class="bdcqzh">{{item.bdcqzh}}</td>
                     <td class="bdcqzh">{{item.bdcqzh}}</td>
                     <td class="qlr">{{item.qlr}}</td>
                     <td class="qlr">{{item.qlr}}</td>
                     <td class="zl">{{item.zl}}</td>
                     <td class="zl">{{item.zl}}</td>
-                    <td class="zl">{{item.type}}</td>
+                    <td class="zl">{{item.type=='zrz'?'自然幢':'多幢'}}</td>
                     <td class="cz">
                     <td class="cz">
                         <el-button
                         <el-button
                                 type="primary"
                                 type="primary"
@@ -64,7 +64,8 @@
                     <li>
                     <li>
                         <span class="label">行政区:</span>
                         <span class="label">行政区:</span>
                         <span class="value">
                         <span class="value">
-                                        <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)" disabled>
+                                        <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)"
+                                                   disabled>
                                             <el-option
                                             <el-option
                                                     v-for="i in xzq"
                                                     v-for="i in xzq"
                                                     :key="i.bsm"
                                                     :key="i.bsm"
@@ -77,7 +78,8 @@
                     <li>
                     <li>
                         <span class="label">地籍区:</span>
                         <span class="label">地籍区:</span>
                         <span class="value">
                         <span class="value">
-                                        <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)" disabled>
+                                        <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)"
+                                                   disabled>
                                             <el-option
                                             <el-option
                                                     v-for="i in djq"
                                                     v-for="i in djq"
                                                     :key="i.bsm"
                                                     :key="i.bsm"
@@ -364,7 +366,7 @@
         getDdicByMC
         getDdicByMC
     } from "@api/common";
     } from "@api/common";
     import {dzList, zrzList} from './../../api/search'
     import {dzList, zrzList} from './../../api/search'
-    import {getQjZdjbxxDetailById} from './../../api/zd'
+    import {getQjZdjbxxDetailById, dzHb} from './../../api/zd'
 
 
     export default {
     export default {
         name: "dzHb",
         name: "dzHb",
@@ -452,6 +454,25 @@
                 }
                 }
             },
             },
             save() {
             save() {
+                let data = {
+                    fwlist: this.dzhbqData,
+                    newdzxmmc: this.dzhbhData.xmmc,
+                    zdbsm: this.zdbsm
+                }
+
+                dzHb(data).then(res => {
+                    if (res.success) {
+                        console.log(res)
+                        this.$message.success("多幢合并成功")
+                        this.$router.push({
+                            path: '/dz',
+                            query: {
+                                source: 1,
+                                bsm: res.result
+                            }
+                        })
+                    }
+                })
             },
             },
             dzClose() {
             dzClose() {
                 this.dzIsVisible = false;
                 this.dzIsVisible = false;
@@ -498,7 +519,7 @@
                     this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
                     this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
                         .then(_ => {
                         .then(_ => {
                             this.dzList.push(data)
                             this.dzList.push(data)
-                            data['type']='多幢'
+                            data['type'] = 'dz'
                             this.addData(data)
                             this.addData(data)
                             return
                             return
                         })
                         })
@@ -507,7 +528,7 @@
                         });
                         });
                 } else {
                 } else {
                     this.dzList.push(data);
                     this.dzList.push(data);
-                    data['type']='多幢'
+                    data['type'] = 'dz'
                     this.addData(data)
                     this.addData(data)
                 }
                 }
             },
             },
@@ -523,7 +544,7 @@
                     this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
                     this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
                         .then(_ => {
                         .then(_ => {
                             this.zrzList.push(data)
                             this.zrzList.push(data)
-                            data['type'] = '自然幢'
+                            data['type'] = 'zrz'
                             this.addData(data)
                             this.addData(data)
                             return
                             return
                         })
                         })
@@ -532,7 +553,7 @@
                         });
                         });
                 } else {
                 } else {
                     this.zrzList.push(data)
                     this.zrzList.push(data)
-                    data['type'] = '自然幢';
+                    data['type'] = 'zrz';
                     this.addData(data)
                     this.addData(data)
                 }
                 }
             },
             },