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

@@ -231,3 +231,13 @@ export function getZrz(zdBsm) {
     })
     })
 }
 }
 
 
+/**
+ * 宗地合并
+ */
+export function ZdHb(data) {
+    return request({
+      url:"/bg/zdSplitMerge/zdHb",
+      method:'post',
+      data:data
+    })
+}

@@ -21,7 +21,7 @@
 					</el-col>
 					</el-col>
 					<el-col :span="8">
 					<el-col :span="8">
 						<el-form-item label="不动产单元号">
 						<el-form-item label="不动产单元号">
-							<el-input 
+							<el-input
 								maxlength="28"
 								maxlength="28"
 								v-model="queryData.bdcdyh"
 								v-model="queryData.bdcdyh"
 								placeholder="输入不动产单元号"
 								placeholder="输入不动产单元号"

@@ -15,6 +15,7 @@
                                 <td class="bdcqzh">不动产权证号</td>
                                 <td class="bdcqzh">不动产权证号</td>
                                 <td class="qlr">权利人</td>
                                 <td class="qlr">权利人</td>
                                 <td class="zl">坐落</td>
                                 <td class="zl">坐落</td>
+                                <td class="cz">操作</td>
                             </tr>
                             </tr>
                             <tr v-if="zdhbqData.length==0">
                             <tr v-if="zdhbqData.length==0">
                                 <td colspan="7">
                                 <td colspan="7">
@@ -35,6 +36,7 @@
                                                        readonly="readonly"/></td>
                                                        readonly="readonly"/></td>
                                 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
                                 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
                                                       readonly="readonly"/></td>
                                                       readonly="readonly"/></td>
+                                <td class="cz" @click="deleteData(index)"><span>删除</span></td>
                             </tr>
                             </tr>
                         </table>
                         </table>
                     </div>
                     </div>
@@ -114,7 +116,7 @@
                                 @close="close"></zd-query-data>
                                 @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" @click="save">保存</el-button>
                     </div>
                     </div>
                 </div>
                 </div>
             </el-tab-pane>
             </el-tab-pane>
@@ -361,6 +363,7 @@
         getListByPbsm,
         getListByPbsm,
         getDdicByMC
         getDdicByMC
     } from "./../../../../api/common";
     } from "./../../../../api/common";
+    import {ZdHb} from "./../../../../api/zd"
     import QueryData from './../../../../components/queryData/queryData'
     import QueryData from './../../../../components/queryData/queryData'
     import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
     import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
 
 
@@ -409,6 +412,64 @@
             })
             })
         },
         },
         methods: {
         methods: {
+            save(){
+              switch (this.tabName) {
+                  case "zd":
+                      this.zdHb();
+                      break
+                  case "dz":
+                      break
+                  case "h":
+                      break;
+                  default:
+                      break
+              }
+            },
+            zdHb(){
+               let oldBsm= this.zdhbqData.map(function (item,index) {
+                    return item.zdbsm;
+                }).join(",")
+                let data={
+                    newzddjqbsm: this.zdhbhData.djqbsm,
+                    newzddjzqbsm: this.zdhbhData.djzqbsm,
+                    newzdsyqlxbsm: this.zdhbqData.syqlxbsm,
+                    newzduserbsm: "",
+                    newzdxmmc: this.zdhbqData.xmmc,
+                    newzdxzqbsm: this.zdhbqData.xzqbsm,
+                    newzdzdtzmbsm: this.zdhbqData.zdtzmbsm,
+                    oldzdbsms: oldBsm
+                }
+                console.log(this.zdhbhData,"宗地合并后数据");
+                console.log(this.zdhbqData,"宗地合并前数据")
+                ZdHb(data).then(res=>{
+                    if (res.success) {
+                     this.$message.success("合并成功")
+                    }else {
+                        this.$message.error("合并失败")
+                    }
+                })
+            },
+            dzHb(){
+
+            },
+            hHb(){
+
+            },
+            deleteData(index){
+                switch (this.tabName) {
+                    case "zd":
+                        this.zdhbqData.splice(index,1)
+                        break
+                    case "dz":
+                        this.dzhbqData.splice(index,1)
+                        break
+                    case "h":
+                        this.hhbqData.splice(index,1)
+                        break
+                    default:
+                        break
+                }
+            },
             getzdtzm() {
             getzdtzm() {
                 getDdicByMC('宗地（宗海）特征码').then(res => {
                 getDdicByMC('宗地（宗海）特征码').then(res => {
                     this.tdtzm = res.result
                     this.tdtzm = res.result