Merge branch 'dev'

 <!--
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-09-14 17:19:26
 -->
@@ -25,12 +25,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="行政区划区县代码：">
-              <el-input v-model="ruleForm.AREACODE"></el-input>
+              <el-input v-model="ruleForm.areacode"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记系统业务号：">
-              <el-input v-model="ruleForm.YWH"></el-input>
+              <el-input v-model="ruleForm.ywh"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -43,47 +43,47 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="原户主姓名：">
-              <el-input v-model="ruleForm.MC_OLD"></el-input>
+              <el-input v-model="ruleForm.mcOld"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="原户主身份证号码：">
-              <el-input v-model="ruleForm.ZJHM_OLD"></el-input>
+              <el-input v-model="ruleForm.zjhmOld"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="原户主联系电话：">
-              <el-input v-model="ruleForm.LXDH_OLD"></el-input>
+              <el-input v-model="ruleForm.lxdhOld"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="新户主姓名：">
-              <el-input v-model="ruleForm.MC_NEW"></el-input>
+              <el-input v-model="ruleForm.mcNew"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="新户主身份证号码：">
-              <el-input v-model="ruleForm.ZJHM_NEW"></el-input>
+              <el-input v-model="ruleForm.zjhmNew"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="新户主联系电话：">
-              <el-input v-model="ruleForm.LXDH_NEW"></el-input>
+              <el-input v-model="ruleForm.lxdhNew"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="房产证编号：">
-              <el-input v-model="ruleForm.FCZBH"></el-input>
+              <el-input v-model="ruleForm.fczbh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="是否过户：">
               <el-switch
-                v-model="ruleForm.SFGH"
+                v-model="ruleForm.sfgh"
                 :active-value='1'
                 active-text="是"
                 :inactive-value="0"
@@ -96,17 +96,23 @@
         <el-row :gutter="10">
           <el-col :span="24">
             <el-form-item label="房屋坐落（地址）：">
-              <el-input v-model="ruleForm.FWZL" type="textarea"
+              <el-input v-model="ruleForm.fwzl" type="textarea"
                 :rows="2"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row class="btn" v-if="viewEdit">
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">保存</el-button>
+          </el-form-item>
+        </el-row>
       </div>
     </el-form>
   </div>
 </template>
 <script>
   import { mapGetters } from "vuex";
+  import { getDlxxByBsmSldy, saveOrUpdateDlxx } from "@/api/sfxx.js";
   export default {
     computed: {
       ...mapGetters(["dictData", "flag"]),
@@ -119,6 +125,8 @@
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
       formdata.append("isEdit", this.viewEdit);
+      console.log(this.propsParam)
+      this.getDlxxByBsmSldy()
     },
     data () {
       return {
@@ -131,6 +139,25 @@
       }
     },
     methods: {
+      getDlxxByBsmSldy() {
+        getDlxxByBsmSldy(this.propsParam.bsmSldy).then((res) => {
+          if (res.code === 200) {
+            if (res.result != null) {
+              this.ruleForm = res.result
+            }
+          }
+        });
+      },
+      saveOrUpdateDlxx() {
+        saveOrUpdateDlxx(this.ruleForm).then((res) => {
+          if (res.code === 200) {
+           this.$message.success("成功")
+          }
+        });
+      },
+      onSubmit () {
+        this.saveOrUpdateDlxx()
+      }
     }
   }
 </script>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-19 16:25:18
+ * @LastEditTime: 2024-01-25 14:45:25
 -->
 <template>
   <div class="from-clues">
@@ -180,9 +180,6 @@
        * @author: renchao
        */
       handleSelectionChange (val) {
-        val.forEach((item, index) => {
-          item.bsm = item.zdbsm;
-        });
         if (this.sqywInfo.sqywdylx == "1") {
           if (val.length > 1) {
             this.bdcdysz = [...val[val.length - 1]];

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-16 14:13:30
+ * @LastEditTime: 2024-01-25 14:45:28
 -->
 <template>
   <div class="from-clues">
     <!-- 表单部分 森林林木 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm">
+      <el-form :model="queryForm" ref="queryForm" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="宗地代码">
@@ -27,10 +27,22 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="6">
+            <el-form-item label="权利人">
+              <el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18" class="btnColRight">
             <el-form-item>
-              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -39,7 +51,7 @@
     <!-- 表格 -->
     <div class="from-clues-content loadingtext">
       <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
-        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
+        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
@@ -68,6 +80,7 @@
     },
     data () {
       return {
+        radioVal: '',
         loading: false,
         queryForm: defaultParameters.defaultParameters(),
         tableData: {
@@ -80,6 +93,28 @@
     },
     mounted () {
       sendThis(this);
+      if (this.sqywInfo.sqywdylx == "1") {
+        this.tableData.columns = [{
+          label: '选择',
+          width: '50px',
+          render: (h, scope) => {
+            return (
+              <div class="orgColumn">
+                <el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
+                  &ensp;
+                </el-radio>
+              </div>
+            )
+          }
+        }].concat(datas.columns())
+      } else {
+        this.tableData.columns =
+          [{
+            type: 'selection',
+            label: '全选',
+            width: '50'
+          }].concat(datas.columns())
+      }
     },
     methods: {
       /**
@@ -96,9 +131,8 @@
             this.tableData.total = total;
             this.tableData.data = records;
           }
-        });
+        })
       },
-
       /**
        * @description: submitForm
        * @author: renchao
@@ -157,49 +191,22 @@
         }
       },
       /**
-       * @description: select
-       * @param {*} selection
-       * @param {*} row
-       * @author: renchao
-       */
-      select (selection, row) {
-        if (this.sqywInfo.sqywdylx == "1") {
-          // 清除 所有勾选项
-          this.$refs.table.clearSelection()
-          // 当表格数据都没有被勾选的时候 就返回
-          // 主要用于将当前勾选的表格状态清除
-          if (selection.length == 0) return
-          this.$refs.table.toggleRowSelection(row, true);
-        }
-      },
-
-      /**
        * @description: handleRowClick
        * @param {*} row
        * @author: renchao
        */
+      handleChange () {
+        let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
+        this.bdcdysz = arr
+      },
       handleRowClick (row) {
         // 如果状态是1，那就是单选
+        let refs = 'table';
         if (this.sqywInfo.sqywdylx == "1") {
-          const bdcdysz = this.bdcdysz
-          this.$refs.table.clearSelection()
-          if (bdcdysz.length == 1) {
-            bdcdysz.forEach(item => {
-              // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
-              if (item == row) {
-                this.$refs.table.toggleRowSelection(row, false);
-              }
-              // 不然就让当前的一行勾选
-              else {
-                this.$refs.table.toggleRowSelection(row, true);
-              }
-            })
-          }
-          else {
-            this.$refs.table.toggleRowSelection(row, true);
-          }
+          this.bdcdysz = [row]
+          this.radioVal = row.bdcdyid
         } else {
-          this.$refs.table.toggleRowSelection(row);
+          this.$refs[refs].toggleRowSelection(row)
         }
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 17:26:18
+ * @LastEditTime: 2024-01-25 14:37:38
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -52,7 +52,7 @@
     <!-- 表格 -->
     <div class="from-clues-content loadingtext">
       <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
-        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
+        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
@@ -80,6 +80,7 @@
     },
     data () {
       return {
+        radioVal: '',
         loading: false,
         queryForm: defaultParameters.defaultParameters(),
         tableData: {
@@ -87,11 +88,33 @@
           columns: datas.columns(),
           data: [],
         },
-        bdcdysz: [],
-      };
+        bdcdysz: []
+      }
     },
     mounted () {
       sendThis(this);
+      if (this.sqywInfo.sqywdylx == "1") {
+        this.tableData.columns = [{
+          label: '选择',
+          width: '50px',
+          render: (h, scope) => {
+            return (
+              <div class="orgColumn">
+                <el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
+                  &ensp;
+                </el-radio>
+              </div>
+            )
+          }
+        }].concat(datas.columns())
+      } else {
+        this.tableData.columns =
+          [{
+            type: 'selection',
+            label: '全选',
+            width: '50'
+          }].concat(datas.columns())
+      }
     },
     methods: {
       /**
@@ -164,21 +187,10 @@
           this.bdcdysz = val;
         }
       },
-      /**
-       * @description: select
-       * @param {*} selection
-       * @param {*} row
-       * @author: renchao
-       */
-      select (selection, row) {
-        if (this.sqywInfo.sqywdylx == "1") {
-          // 清除 所有勾选项
-          this.$refs.table.clearSelection()
-          // 当表格数据都没有被勾选的时候 就返回
-          // 主要用于将当前勾选的表格状态清除
-          if (selection.length == 0) return
-          this.$refs.table.toggleRowSelection(row, true);
-        }
+      handleChange () {
+        let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
+        arr[0].bsm = arr[0].zdbsm
+        this.bdcdysz = arr
       },
       /**
        * @description: handleRowClick
@@ -187,26 +199,13 @@
        */
       handleRowClick (row) {
         // 如果状态是1，那就是单选
+        let refs = 'table';
         if (this.sqywInfo.sqywdylx == "1") {
-          const bdcdysz = this.bdcdysz
-          this.$refs.table.clearSelection()
-          if (bdcdysz.length == 1) {
-            bdcdysz.forEach(item => {
-              // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
-              if (item == row) {
-                this.$refs.table.toggleRowSelection(row, false);
-              }
-              // 不然就让当前的一行勾选
-              else {
-                this.$refs.table.toggleRowSelection(row, true);
-              }
-            })
-          }
-          else {
-            this.$refs.table.toggleRowSelection(row, true);
-          }
+          row.bsm = row.zdbsm
+          this.bdcdysz = [row]
+          this.radioVal = row.bdcdyid
         } else {
-          this.$refs.table.toggleRowSelection(row);
+          this.$refs[refs].toggleRowSelection(row)
         }
       },
       /**

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-31 08:56:52
+ * @LastEditTime: 2024-01-25 14:38:58
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -15,11 +15,11 @@ class data extends filter {
   }
   columns () {
     return [
-      {
-        type: 'selection',
-        label: '全选',
-        selectable: this.selected
-      },
+      // {
+      //   type: 'selection',
+      //   label: '全选',
+      //   selectable: this.selected
+      // },
       {
         label: '序号',
         type: 'index',