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
+    })
+}

@@ -23,8 +23,8 @@
                                 </div>
                                 <ul>
                                     <li v-for="(item,index) in zdZxx.dzList" :key="index"
-                                        :class="[{'border':'((index+1)%2) == 0'},{'nosearch':zdDzList.includes(item)}]"
-                                    >{{item.xmmc}}</li>
+                                        :class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdDzList.includes(item)}]"
+                                    >{{item.displays}}</li>
                                 </ul>
                             </div>
                             <div class="zrz">
@@ -33,7 +33,7 @@
                                 </div>
                                 <ul>
                                     <li v-for="(item,index) in zdZxx.zrzList" :key="index"
-                                        :class="[{'border':'((index+1)%2) == 0'},{'nosearch':zdZrzList.includes(item)}]">{{item.xmmc}}
+                                        :class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdZrzList.includes(item)}]">{{item.displays}}
                                     </li>
                                 </ul>
                             </div>
@@ -730,6 +730,31 @@
             })
         },
         methods: {
+            // 重置数据
+            result(){
+                switch (this.tabName) {
+                    case "zd":
+                        this.zdFghData={
+                            oldZdbsm: "",
+                            newZdlist: []
+                        }
+                        break
+                    case "dz":
+                        this.dzFghData={
+                            oldZdbsm: "",
+                            newZdlist: []
+                        }
+                        break
+                    case "h":
+                        this.hFghData={
+                            oldZdbsm: "",
+                            newZdlist: []
+                        }
+                        break;
+                    default:
+                        break
+                }
+            },
             xzDz(bsm, index) {
                 this.zdFghData.newZdlist.fwlist[index].push({
                     zbsm: bsm,
@@ -945,12 +970,7 @@
                             syqlxbsm: "",
                             zdtzmbsm: "",
                             userbsm: "",
-                            fwlist: [
-                            /*    {
-                                    zbsm: "",
-                                    ztype: ""
-                                }*/
-                            ]
+                            fwlist: []
                         });
                         this.changeXzq(this.checkedData.xzqbsm)
                         this.changeDjq(this.checkedData.djqbsm)
@@ -965,12 +985,7 @@
                             syqlxbsm: "",
                             zdtzmbsm: "",
                             userbsm: "",
-                            fwlist: [
-                                {
-                                    zbsm: "",
-                                    ztype: ""
-                                }
-                            ]
+                            fwlist: []
                         });
                         this.changeXzq(this.checkedData.xzqbsm)
                         this.changeDjq(this.checkedData.djqbsm)
@@ -985,12 +1000,7 @@
                             syqlxbsm: "",
                             zdtzmbsm: "",
                             userbsm: "",
-                            fwlist: [
-                                {
-                                    zbsm: "",
-                                    ztype: ""
-                                }
-                            ]
+                            fwlist: []
                         });
                         this.changeXzq(this.checkedData.xzqbsm)
                         this.changeDjq(this.checkedData.djqbsm)
@@ -1019,6 +1029,7 @@
                 this.centerDialogVisible = false;
             },
             newAdd: function () {
+                this.result();
                 this.centerDialogVisible = true;
             },
             getData: function (data) {
@@ -1157,7 +1168,6 @@
                         padding: 5px;
                         text-align: center;
                         line-height: 20px;
-                        color: #BBB;
                     }
                 }
             }
@@ -1171,7 +1181,6 @@
                         width: 48%;
                         text-align: center;
                         display: inline-block;
-                        color: #BBB;
                     }
                 }
             }
@@ -1253,7 +1262,12 @@
         .fgh {
             box-sizing: border-box;
             /*padding: 0 18px;*/
+            height: 480px;
+            overflow: auto;
             margin-top: 10px;
+            table{
+               margin: 0 20px ;
+            }
         }
         .header-button {
             height: 50px;
@@ -1294,6 +1308,6 @@
         width: 150px;
     }
     .nosearch{
-        color: #000 !important;
+        color: #BBB !important;
     }
 </style>

@@ -15,6 +15,7 @@
                                 <td class="bdcqzh">不动产权证号</td>
                                 <td class="qlr">权利人</td>
                                 <td class="zl">坐落</td>
+                                <td class="cz">操作</td>
                             </tr>
                             <tr v-if="zdhbqData.length==0">
                                 <td colspan="7">
@@ -35,6 +36,7 @@
                                                        readonly="readonly"/></td>
                                 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
                                                       readonly="readonly"/></td>
+                                <td class="cz" @click="deleteData(index)"><span>删除</span></td>
                             </tr>
                         </table>
                     </div>
@@ -114,7 +116,7 @@
                                 @close="close"></zd-query-data>
 
                     <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>
             </el-tab-pane>
@@ -361,6 +363,7 @@
         getListByPbsm,
         getDdicByMC
     } from "./../../../../api/common";
+    import {ZdHb} from "./../../../../api/zd"
     import QueryData from './../../../../components/queryData/queryData'
     import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
 
@@ -409,6 +412,64 @@
             })
         },
         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() {
                 getDdicByMC('宗地（宗海）特征码').then(res => {
                     this.tdtzm = res.result