Merge branch 'dev'

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 14:16:39
+ * @LastEditTime: 2024-01-22 11:00:07
  */
 import { getForm } from "../flowform";
 import { getHomeNoticeList } from "@/api/home.js"
@@ -40,7 +40,7 @@ export default {
      */
     beforeLeave (activeName, oldActiveName) {
       sessionStorage.setItem('activeName', activeName);
-      if (activeName && activeName != 0) this.getFromRouter(activeName)
+      this.getFromRouter(activeName)
     },
     /**
      * @description: 切换选项卡内容组件

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 15:02:23
+ * @LastEditTime: 2024-01-22 11:02:34
 -->
 <template>
   <div class="container">
@@ -256,6 +256,7 @@
               this.fresh++;
             }
             this.ableOperation = this.tabList[0].ableOperation;
+            this.currentSelectTab = this.tabList[0];
             //批量操作无分屏按钮
             if (index != null) {
               //处理分屏材料信息

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 10:45:37
+ * @LastEditTime: 2024-01-22 11:04:51
 -->
 <template>
   <div class="container">
@@ -137,6 +137,7 @@
               that.fresh++;
             }
             this.ableOperation = this.tabList[0].ableOperation
+            this.currentSelectTab = this.tabList[0];
             //批量操作无分屏按钮
             if (index != null) {
               //处理分屏材料信息

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 10:56:52
+ * @LastEditTime: 2024-01-22 10:43:54
 -->
 <template>
   <!-- 受理信息 -->

@@ -104,7 +104,11 @@
         </el-table-column>
         <el-table-column
           property="syqmj"
-          label="使用权面积">
+          label="面积">
+        </el-table-column>
+         <el-table-column
+          property="qlytmc"
+          label="用途">
         </el-table-column>
         <el-table-column
           property="zl"
@@ -283,8 +287,8 @@
        */
       handleRowClick (row) {
         this.queryForm.bhqkbsm = row.bhqkbsm
-        this.radioVal = row.bdcdyh
-        row.bglx = '1'
+        //this.radioVal = row.bdcdyh
+        //row.bglx = '1'
         selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {

@@ -81,7 +81,7 @@ class data extends filter {
       },
       {
         prop: "qlmjmc",
-        width: '100',
+        width: 100,
         label: "使用权面积",
       },
       {
@@ -198,7 +198,12 @@ class datatwo extends filter {
       {
         prop: "qlmjmc",
         width: 100,
-        label: "使用权面积",
+        label: "面积",
+      },
+      {
+        prop: "qlytmc",
+        width: 100,
+        label: "用途",
       },
       {
         prop: "zl",