Merge branch 'dev'

 /*
  * @Description: 登记簿详情页
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:11:14
+ * @LastEditTime: 2023-08-11 15:27:45
  */
 
 import request from '@/utils/request'
@@ -230,3 +230,16 @@ export function getNydsyqList (data) {
     method: 'post',
   })
 }
+
+/**
+ * @description: 获取林权登记簿信息
+ * @param {*} data
+ * @author: renchao
+ */
+ export function getLqList (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbDetail/getLqList',
+    method: 'post',
+    data
+  })
+}

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 16:06:21
+ * @LastEditTime: 2023-08-11 16:48:17
 -->
 <template>
   <transition name="msgbox-fade" v-if="myShow">
@@ -149,7 +149,7 @@
     min-height: 200px;
     transform: translate(-50%, -50%);
     border-radius: 5px;
-    overflow: hidden;
+    // overflow: hidden;
   }
 
   .ls-mask-window b {

@@ -142,7 +142,7 @@
     min-height: 200px;
     transform: translate(-50%, -50%);
     border-radius: 5px;
-    overflow: hidden;
+    // overflow: hidden;
   }
 
   .ls-mask-window b {

@@ -139,7 +139,7 @@
     min-height: 200px;
     transform: translate(-50%, -50%);
     border-radius: 5px;
-    overflow: hidden;
+    // overflow: hidden;
   }
 
   .ls-mask-window b {

@@ -592,22 +592,6 @@
           }
         });
       },
-      // // 更新土地用途信息
-      // upDateTdytxxList(val) {
-      //   this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-      //   this.key++;
-      // },
-      // // 更新权利人信息
-      // upDateQlrxxList(val) {
-      //   this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      //   this.czrOptions = this.ruleForm.qlrData;
-      //   this.key++;
-      // },
-      // // 更新义务人信息
-      // upDateYwrxxList(val) {
-      //   this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-      //   this.key++;
-      // },
       /**
        * @description: onSubmit
        * @author: renchao

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 16:45:02
+ * @LastEditTime: 2023-08-14 10:40:10
 -->
 <template>
   <!-- 受理信息 -->
@@ -368,6 +368,7 @@
             dname: "历史",
           },
         ],
+        tdxz: null,
         isShow: false,
         disabled: true,
         czrOptions: [],
@@ -513,7 +514,6 @@
           }
         });
       },
-      // 更新土地用途信息
       /**
        * @description: 更新土地用途信息
        * @param {*} val

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 16:45:13
+ * @LastEditTime: 2023-08-14 10:29:57
 -->
 <template>
   <!-- 受理信息 -->
@@ -362,33 +362,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group
-                v-model="ruleForm.qlxx.sqfbcz"
-                :disabled="!ableOperation">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="持证人：">
-              <el-select
-                v-model="ruleForm.czr"
-                placeholder="持证人"
-                :disabled="!ableOperation">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -489,7 +462,10 @@
         ],
         isShow: false,
         disabled: true,
+<<<<<<< HEAD
         czrOptions: [],
+=======
+>>>>>>> dev
         ssQlxxList: [],
         ruleForm: {},
         ableOperation: false,
@@ -509,12 +485,21 @@
           ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
         },
       };
+<<<<<<< HEAD
     },
     created () { },
     mounted () {
       this.loadData();
       this.ableOperation = this.$parent.ableOperation;
     },
+=======
+    },
+    created () { },
+    mounted () {
+      this.loadData();
+      this.ableOperation = this.$parent.ableOperation;
+    },
+>>>>>>> dev
     methods: {
       /**
        * @description: ssQlxxchange
@@ -596,6 +581,28 @@
           this.ssqlxxshow = true;
         }
       },
+<<<<<<< HEAD
+
+      // 字典
+      /**
+       * @description: 字典
+       * @param {*} val
+       * @author: renchao
+       */
+      getDictData (val) {
+        return store.getters.dictData[val];
+      },
+      /**
+       * @description: loadData
+       * @author: renchao
+       */
+      loadData () {
+        this.$startLoading();
+        this.propsParam.isEdit = this.$parent.isEdit;
+        init(this.propsParam).then((res) => {
+          if (res.code == 200) {
+            this.ruleForm = res.result;
+=======
 
       // 字典
       /**
@@ -616,6 +623,9 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
+            this.ruleForm.tdsyq.mjdw = "1"
+
+>>>>>>> dev
             let djlx = this.ruleForm.qlxx.djlx;
             if (djlx == null || djlx == 100) {
               this.ssqlxxshow = false;
@@ -653,7 +663,10 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
+<<<<<<< HEAD
         this.czrOptions = this.ruleForm.qlrData;
+=======
+>>>>>>> dev
         this.key++;
       },
       /**

@@ -10,7 +10,7 @@ var qlxxPage = [
     { qllx: "A07", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权" },
     { qllx: "A08", id: "", form: "", label: "集体建设用地使用权/房屋所有权" },
     { qllx: "A09", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权" },
-    { qllx: "A11", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权" },
+    { qllx: "A11", id: "ldsyq", form: "ldsyq.vue", label: "林地使用权" },
     { qllx: "A12", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权/森林、林木使用权" },
     { qllx: "A13", id: "jsydsyq", form: "jsydsyq.vue", label: "草原使用权" },
     { qllx: "A14", id: "jsydsyq", form: "jsydsyq.vue", label: "水域滩涂养殖权" },

@@ -198,7 +198,8 @@
           flex: 1;
           border-right: 2px solid #e3e2e2;
           line-height: 40px;
-          overflow: hidden;
+          overflow: unset;
+          width: 450px;
         }
         div:last-child{
           border: 0;

+<!--
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-08-11 15:33:53
+-->
+<template>
+    <div class="djxxTable">
+      <div class="tableBox">
+        <div class="title">
+          {{ title }}
+          <div class="checkbox">
+            <el-checkbox-group v-model="checkList" @change="checkChange">
+              <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
+            </el-checkbox-group>
+          </div>
+        </div>
+        <div class="xxTableBox rollTable">
+          <!-- 固定前三个 -->
+          <table class="xxTable">
+            <tr v-for="(item, colindex) in columns" :key="colindex">
+              <td>
+                {{ item.label }}
+              </td>
+              <td v-for="(row, index) in tableData" :key="index" :class="[
+                row.qszt == '2' ? 'lishi' : '',
+                row.qszt == '0' ? 'linshi' : '',
+                row.qlzt == '4' ? 'linshi' : '',
+  
+                item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
+                item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
+                item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
+                item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
+              ]">
+                <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
+                  <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
+                  <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
+                </div>
+                <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
+                  有效
+                </div>
+                <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
+                  正在补录
+                </div>
+                <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
+                  正在申请
+                </div>
+                <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
+                  正在注销
+                </div>
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
+  
+                <span v-else> {{ row[item.prop] }}</span>
+              </td>
+              <td v-for="count in emptycolNum" :key="~count"></td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    import { datas } from "./qlxxFormData.js";
+    import { getSjlx } from "@/utils/dictionary.js";
+    import { getLqList } from "@/api/djbDetail.js";
+    export default {
+      data () {
+        return {
+          title: "林地使用权登记信息",
+          qsztList: datas.columns().qsztList,
+          checkList: datas.columns().checkList,
+          //传递参数
+          propsParam: this.$attrs,
+          //列表数据
+          tableData: [],
+          //空列值个数
+          emptycolNum: datas.columns().emptycolNum,
+          //列名称对象
+          columns: datas.columns().LDSYQ,
+        };
+      },
+      created () {
+        this.loadData();
+      },
+      methods: {
+        /**
+         * @description: loadData
+         * @author: renchao
+         */
+        loadData () {
+  
+          if (this.$parent.addRepairRecord) {
+            this.columns.unshift({
+              prop: "cz",
+              label: "操作"
+            })
+          }
+          getLqList({
+            bdcdyid: this.propsParam.bdcdyid,
+            qllx: this.propsParam.qllx,
+            qszt: this.checkList,
+          }).then((res) => {
+            if (res.code === 200) {
+              this.tableData = res.result;
+              this.tableData.forEach(item => {
+                item.sjlx = getSjlx(item.sjlx)
+              })
+              if (this.tableData.length < datas.columns().emptycolNum) {
+                this.emptycolNum =
+                  datas.columns().emptycolNum - this.tableData.length;
+              } else {
+                this.emptycolNum = 0;
+              }
+            }
+          });
+        },
+        /**
+         * @description: checkChange
+         * @author: renchao
+         */
+        checkChange () {
+          if (this.checkList.length === 0) {
+            this.tableData = [];
+            this.emptycolNum = datas.columns().emptycolNum;
+          } else {
+            this.loadData();
+          }
+        },
+        /**
+         * @description: getQsztName
+         * @param {*} code
+         * @author: renchao
+         */
+        getQsztName (code) {
+          let name = "";
+          for (let item of this.qsztList) {
+            if (item.value == code) {
+              name = item.label;
+              break;
+            }
+          }
+          return name;
+        },
+        // 新增一条补录信息
+        /**
+         * @description: 新增一条补录信息
+         * @param {*} row
+         * @param {*} del
+         * @author: renchao
+         */
+        editDialog (row, del) {
+          this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$parent.addRepairRecord(row, del)
+  
+            this.$message({
+              type: 'success',
+              message: '补录成功!'
+            });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '取消编辑'
+            });
+          });
+  
+        },
+      },
+    };
+  </script>
+  
+  <style lang="scss" scoped>
+    @import "./qlxxCommon.scss";
+  </style>
+  
\ No newline at end of file

@@ -1136,6 +1136,92 @@ class data extends filter {
           label: "注销异议登记时间",
         },
       ],
+      LDSYQ: [
+        {
+          prop: "qszt",
+          label: "权属状态",
+        },
+        {
+          prop: "sjlx",
+          label: "数据类型",
+        },
+        {
+          prop: "qllxmc",
+          label: "权利类型",
+        },
+        {
+          prop: "djlxmc",
+          label: "登记类型",
+        },
+        {
+          prop: "ssywh",
+          label: "上手业务号",
+        },
+        {
+          prop: "ywh",
+          label: "业务号",
+        },
+        {
+          prop: "bdcdyh",
+          label: "不动产单元号",
+        },
+        {
+          prop: "zl",
+          label: "坐落",
+        },
+        {
+          prop: "gyqk",
+          label: "共有情况",
+        },
+        {
+          prop: "qlrlx",
+          label: "权利人类型",
+        },
+        {
+          prop: "qlrmc",
+          label: "权利人",
+        },
+        {
+          prop: "qlrzjzl",
+          label: "证件种类",
+        },
+        {
+          prop: "qlrzjhm",
+          label: "证件号",
+        },
+        {
+          prop: "qlxzmc",
+          label: "权利性质",
+        },
+        {
+          prop: "ytmc",
+          label: "土地用途",
+        },
+        {
+          prop: "fbfdm",
+          label: "发包方代码",
+        },
+        {
+          prop: "fbfmc",
+          label: "发包方名称",
+        },
+        {
+          prop: "mjmc",
+          label: "使用权面积",
+        },
+        {
+          prop: "djjg",
+          label: "登记机构",
+        },
+        {
+          prop: "dbr",
+          label: "登簿人",
+        },
+        {
+          prop: "djsj",
+          label: "登记时间",
+        },
+      ]
     }
   }
 

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-04 16:33:46
+ * @LastEditTime: 2023-08-14 10:26:42
 -->
 <template>
   <div class="slxx">
@@ -250,6 +250,7 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
       // 更新权利人信息

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 16:46:25
+ * @LastEditTime: 2023-08-14 10:23:11
 -->
 <template>
   <div class="slxx">
@@ -334,8 +334,10 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
+
       /**
        * @description: 更新权利人信息
        * @param {*} val

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 16:46:32
+ * @LastEditTime: 2023-08-14 10:27:21
 -->
 <template>
   <div class="slxx">
@@ -372,6 +372,7 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
       // 更新权利人信息

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-01 18:14:10
+ * @LastEditTime: 2023-08-14 10:37:56
 -->
 <template>
   <div class="slxx">
@@ -99,7 +99,7 @@
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
-          <el-col :span="14" v-if="ruleForm.sldyList.length>0">
+          <el-col :span="12" v-if="ruleForm.sldyList.length>0">
             <el-form-item label="共有方式：">
               <el-radio-group :disabled="!ableOperation" @change="showCZInfo"
                 v-model="ruleForm.sldyList[0].gyfs">
@@ -111,19 +111,34 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="5" v-show="ruleForm.sldyList.length>0 && ruleForm.slsq.gyfs != '0'">
-            <el-form-item label="是否分别持证：" v-if="ruleForm.sldyList.length>0">
-              <el-radio-group v-model="ruleForm.sldyList[0].sqfbcz">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
+          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+            <el-form-item label="是否分别持证：">
+              <el-radio-group
+                v-model="ruleForm.sldy.sqfbcz"
+                :disabled="!ableOperation">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="5" v-show="ruleForm.sldyList.length>0 && ruleForm.sldyList[0].gyfs != '0'">
+          <el-col
+            :span="6"
+            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
             <el-form-item label="持证人：">
-              <el-input v-model="ruleForm.slsq.czr"></el-input>
+              <el-select
+                v-model="ruleForm.czr"
+                placeholder="持证人"
+                :disabled="!ableOperation">
+                <el-option
+                  v-for="item in czrOptions"
+                  :key="item.zjh"
+                  :label="item.sqrmc"
+                  :value="item.zjh">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
+
         </el-row>
         <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
           :gyfs="ruleForm.slsq.gyfs" />
@@ -194,6 +209,7 @@
           , user: {}//用户
           , zdjbxx: {}//宗地基本信息
         },
+        czrOptions: [],
         //传递参数
         propsParam: this.$attrs,
         //表单是否可操作
@@ -244,6 +260,7 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        
       },
       /**
        * @description: showCZInfo

@@ -266,6 +266,7 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+        this.czrOptions = this.ruleForm.qlrData;
         this.key++;
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-11 08:51:34
+ * @LastEditTime: 2023-08-14 10:27:43
 -->
 <template>
   <!-- 受理信息 -->
@@ -270,6 +270,7 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
       /**

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 16:46:55
+ * @LastEditTime: 2023-08-14 10:28:15
 -->
 <template>
   <!-- 受理信息 -->
@@ -270,6 +270,7 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
       /**

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-04 15:46:17
+ * @LastEditTime: 2023-08-14 10:27:58
 -->
 <template>
   <div class="slxx">
@@ -321,6 +321,7 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
       // 更新权利人信息

@@ -399,7 +399,6 @@
       };
     },
     methods: {
-      // 更新土地用途信息
       /**
        * @description: 更新土地用途信息
        * @param {*} val

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-09 16:12:34
+ * @LastEditTime: 2023-08-11 15:54:34
 -->
 <template>
   <div class="from-clues">
@@ -56,7 +56,7 @@
   import store from '@/store/index.js'
   import table from "@/utils/mixin/table";
   import { ywPopupDialog } from "@/utils/popup.js";
-  import { selectLqQjdc } from "@/api/ywsq.js";
+  import { selectZdjbxx } from "@/api/ywsq.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
   import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
@@ -93,7 +93,7 @@
       queryClick () {
         this.$startLoading();
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
-        selectLqQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
+        selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
             let { total, records } = res.result;