Merge branch 'dev'

@@ -83,7 +83,7 @@
       },
       minHeight: {
         type: Number,
-        default: undefined
+        default: 160
       },
       heightNumSetting: {
         type: Boolean,

@@ -31,6 +31,8 @@ export default {
       rightButtonList: [],
       //批量按钮名称
       batchButtonName: '',
+      // 受理申请信息
+      slsq: {}
     }
   },
   computed: {
@@ -57,6 +59,7 @@ export default {
         if (res.code === 200) {
           this.leftButtonList = res.result.button;
           this.rightButtonList = res.result.operation;
+          this.slsq = res.result.slsq
         }
       })
     },

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-05-18 14:58:55
+ * @LastEditTime: 2023-05-22 09:45:59
 -->
 <template>
   <div class="container">
@@ -26,8 +26,8 @@
     <!-- 内容框架 -->
     <div class="containerFrame">
       <!-- 左侧菜单栏 区分业务-->
-      <ordinaryMenu @getCurrentSelectProps="getCurrentSelectProps" />
-      <!-- <segmentMenu @getCurrentSelectProps="getCurrentSelectProps" /> -->
+      <segmentMenu v-if="slsq.djqxbm == 'A0320099' || slsq.djqxbm == 'A0330099'" @getCurrentSelectProps="getCurrentSelectProps" />
+      <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" />
       <div class="leftCon">
         <!-- 分屏左侧预览 -->
         <div v-if="splitScreen" class="splitScreen-con">

@@ -40,17 +40,15 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="from-clues-content loadingtext">分割合并前权利信息
-      <lb-table ref="table"  @row-dblclick="handleRowClick" :pagination = false :page-size="pageData.pageSize" :calcHeight="300"
-        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"  :column="tableData.columns"
-        :data="tableData.data" heightNumSetting :maxHeight="350" :minHeight="350" >
+    <div class="from-clues-content loadingtext">
+      分割合并前权利信息
+      <lb-table ref="table" @row-click="handleRowClick" heightNumSetting :pagination=false
+        :column="tableData.columns" :data="tableData.data">
       </lb-table>
     </div>
-    <div class="from-clues-content loadingtext">分割合并后宗地信息
-      <lb-table ref="table" @row-dblclick="handleRowClick" :pagination = false :page-size="pageData.pageSize" :calcHeight="300"
-        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange" :column="tableData.columns1"
+    <div class="from-clues-content loadingtext">
+      分割合并后宗地信息
+      <lb-table ref="table" :pagination=false :calcHeight="500" :column="tableData.columns1"
         :data="tableData.datastwo">
       </lb-table>
     </div>
@@ -63,11 +61,11 @@
 <script>
   //首次登记
   import store from '@/store/index.js'
-  import { datas,datastwo, sendThis } from "../javascript/selectJsydsyq.js";
+  import { datas, datastwo, sendThis } from "../javascript/selectJsydsyq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
   import jump from "./mixin/jump";
-  import { startBusinessFlow, selectJsydQlxxSplitMergeBefore,selectZdjbxxSplitMergeLast} from "@/api/ywbl.js";
+  import { startBusinessFlow, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js";
   export default {
     mixins: [table, jump],
     props: {
@@ -85,7 +83,7 @@
             render: (h, scope) => {
               return (
                 <div class="orgColumn">
-              <el-radio v-model={this.radioVal} label={scope.row.bsmQlxx}>
+                  <el-radio v-model={this.radioVal} label={scope.row.bhqkbsm}>
                     &ensp;
                   </el-radio>
                 </div>
@@ -94,39 +92,29 @@
           },].concat(datas.columns()),
           data: [],
           columns1: datastwo.columns1(),
-           datastwo:[]
+          datastwo: []
         },
         bdcdysz: [],
-        radioVal:""
+        radioVal: ""
       }
     },
     mounted () {
-      sendThis(this);
-    },
-   watch: {
-     radioVal: {
-       deep: true,
-       handler(newVal, oldVal) {
-          this.close()
-       },
-     },
+      sendThis(this)
     },
     methods: {
       // 单选事件
-      close(){
-      this.tableData.data.forEach(e => {
-        if(e.bsmQlxx=this.radioVal){
-           this.queryForm.bhqkbsm=e.bhqkbsm
-          //  获取分割合并后宗地信息
-          selectZdjbxxSplitMergeLast({ ...this.queryForm}).then((res) => {
+      close () {
+        this.queryForm.bhqkbsm = this.radioVal
+        selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
-            this.tableData.datastwo = res.result;
-          }
-        });
+            this.tableData.datastwo = res.result
+            this.tableData.datastwo.forEach(item => {
+              item.bglx = '2'
+            })
+            this.bdcdysz = [this.bdcdysz[0], ...this.tableData.datastwo]
           }
-       });
-
+        })
       },
       queryClick () {
         this.$startLoading();
@@ -134,17 +122,21 @@
         selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
-            let { total, records } = res.result;
-            this.tableData.total = total;
-            this.tableData.data = res.result;
+            this.tableData.data = res.result
           }
         });
       },
+      handleRowClick (val) {
+        this.radioVal = val.bhqkbsm
+        let obj = val
+        obj.bsmSsql = val.bsmQlxx;
+        obj.ybdcqzsh = val.bdcqzh;
+        obj.bglx = '1';
+
+        this.bdcdysz[0] = obj
+        this.close()
+      },
       submitForm () {
-        if (this.bdcdysz.length == 0) {
-          this.$message.error("请至少选择一条数据");
-          return;
-        }
         startBusinessFlow({
           bsmSqyw: this.sqywInfo.parentid,
           bdcdysz: this.bdcdysz,
@@ -163,17 +155,9 @@
               store.dispatch('user/refreshPage', true);
             }
           } else {
-            this.$message.error(res.message);
+            this.$message.error(res.message)
           }
-        });
-      },
-      handleSelectionChange (val) {
-        val.forEach((item, index) => {
-          item.bsmSsql = item.bsmQlxx;
-          item.ybdcqzsh = item.bdcqzh;
-          item.bglx="1";
-        });
-        this.bdcdysz = val;
+        })
       },
       openBook (row) {
         var param = {