Merge branch 'dev'

 /*
  * @Description: 业务申请
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 14:52:03
+ * @LastEditTime: 2023-11-14 09:30:08
  */
 
 import request from '@/utils/request'
@@ -109,6 +109,19 @@ export function selectZdjbxxSplitMergeLast (data) {
   })
 }
 
+/**
+ * @description: 土地变化情况
+ * @param {*} data
+ * @author: renchao
+ */
+export function selectZdjbxxSplitMerge (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxxSplitMerge',
+    method: 'post',
+    data
+  })
+}
+
 /*
 业务办理-选择单元-查询自然幢信息
 */

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-31 10:49:31
+ * @LastEditTime: 2023-11-14 13:23:26
 -->
 <template>
   <div class="from-clues">
@@ -46,7 +46,6 @@
     </div>
     <!-- 表格 -->
     <div class="from-clues-content loadingtext">
-      分割合并前权利信息
       <el-table
         :data="tableData.data"
         height="230"
@@ -125,7 +124,7 @@
 
     </div>
     <div class="from-clues-content loadingtext">
-      分割合并后宗地信息
+      土地变化情况
       <lb-table ref="table" :pagination=false :calcHeight="500" :column="tableData.columns1"
         :data="tableData.datastwo">
       </lb-table>
@@ -144,7 +143,7 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywsq.js";
+  import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMerge } from "@/api/ywsq.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
@@ -182,15 +181,14 @@
             this.queryForm.bhqkbsm = item.bhqkbsm
           }
         })
-        selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
+        selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
             this.tableData.datastwo = res.result
             this.tableData.datastwo.forEach(item => {
               item.bsm = item.zdbsm;
-              item.bglx = '2'
             })
-            this.bdcdysz = [this.bdcdysz[0], ...this.tableData.datastwo]
+            this.bdcdysz = this.tableData.datastwo
           }
         })
       },
@@ -283,15 +281,14 @@
         this.queryForm.bhqkbsm = row.bhqkbsm
         this.radioVal = row.bdcdyh
         row.bglx = '1'
-        selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
+        selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
             this.tableData.datastwo = res.result
             this.tableData.datastwo.forEach(item => {
               item.bsm = item.zdbsm;
-              item.bglx = '2'
             })
-            this.bdcdysz = [row, ...this.tableData.datastwo]
+            this.bdcdysz = this.tableData.datastwo
           }
         })
       }

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-26 15:11:19
+ * @LastEditTime: 2023-11-14 13:10:27
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -141,38 +141,61 @@ class datatwo extends filter {
         }
       },
       {
+        label: "变更类型",
+        width: 80,
+        render: (h, scope) => {
+          return (
+            <div>
+              {
+                scope.row.bglx == '1' ? <span>变更前</span> : <span>变更后</span>
+              }
+            </div>
+          )
+        }
+      },
+      {
         prop: "qllxmc",
         label: "权利类型",
       },
       {
-        prop: "zddm",
-        label: "宗地代码",
+        label: "不动产单元号",
+        width: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcdyh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcdyh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "bdcdyh",
-        label: "不动产单元号",
-        minWidth: '110'
+        label: "不动产权证号",
+        width: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "qlxzmc",
-        label: "权利性质",
+        prop: "qlrmc",
+        label: "使用权人",
       },
       {
-        prop: "syqmj",
-        label: "宗地面积(㎡)",
+        prop: "qlrzjhm",
+        label: "证件号",
       },
-      // {
-      //   prop: "qlsdfsmc",
-      //   label: "权利设定方式",
-      // },
       {
-        prop: "qlytmc",
-        label: "土地用途",
+        prop: "qlxzmc",
+        width: '80',
+        label: "权利性质",
       },
       {
-        prop: "zl",
-        label: "坐落",
-        minWidth: '110'
+        prop: "qlmjmc",
+        width: '100',
+        label: "使用权面积",
       },
       {
         label: '操作',
@@ -182,11 +205,11 @@ class datatwo extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button v-show={scope.row.bglx == '1'} type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }
-      },
+      }
     ]
   }