Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-21 11:23:22
+ * @LastEditTime: 2023-09-01 09:18:29
 -->
 <template>
   <div class="edit">
@@ -460,7 +460,6 @@
   }
   .edit {
     height: 100%;
-    background-color: #f4f9ff;
     .tab-content {
       border: 1px solid #dedede;
       border-left: 0;

@@ -1336,7 +1336,7 @@ class data extends filter {
           label: "森林类别",
         },
         {
-          prop: "zylz",
+          prop: "zysz",
           label: "主要树种",
         },
         {

@@ -27,8 +27,15 @@ class data extends filter {
         }
       },
       {
-        prop: 'bdcqzh',
+        width: '130',
         label: '不动产权证号',
+        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: 'djsj',
@@ -43,8 +50,15 @@ class data extends filter {
         label: '网签时间',
       },
       {
-        prop: 'bdcdyh',
+        width: '130',
         label: '不动产单元号',
+        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: 'gyfs',
@@ -59,8 +73,15 @@ class data extends filter {
         label: '证件号',
       },
       {
-        prop: 'zl',
         label: '房地坐落',
+        width: '100',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: 'fwmj',

@@ -141,7 +141,6 @@
       handleSort (name, sort) {
         console.log(name, sort);
       },
-      // 查看
       /**
        * @description: 查看
        * @param {*} scope

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-30 16:14:24
+ * @LastEditTime: 2023-09-01 10:10:15
 -->
 <template>
   <dialogBox
     title="申请人信息"
-    width="60%"
+    width="75%"
     isMain
     v-model="myValue"
     :isFullscreen="false"
     @submitForm="submitForm"
     @closeDialog="closeDialog"
     :isButton="showButton">
+
+    <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header">
+      <el-tab-pane label="基本信息" name="1"></el-tab-pane>
+      <el-tab-pane label="个人信息备案" name="2"></el-tab-pane>
+      <el-tab-pane label="企业信息备案" name="3"></el-tab-pane>
+    </el-tabs>
+
     <el-form
+      v-if="activeName==1"
       :model="ruleForm"
       :rules="rules"
       ref="ruleForm"
@@ -244,12 +252,75 @@
         </el-col>
       </el-row>
     </el-form>
+    <div v-if="activeName==2">
+      <el-form :model="queryForm">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="证件号">
+              <el-input placeholder="证件号" maxlength="28" v-model="queryForm.zjh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="姓名/名称">
+              <el-input placeholder="" v-model.trim="queryForm.sqrmc" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" class="btnColRight">
+            <el-form-item>
+              <el-button type="primary" @click="handleSearch">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <lb-table
+        :page-size="pageData.pageSize" :calcHeight="435"
+        :current-page.sync="pageData.currentPage" :total="tableDataGr.total" @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange" :column="tableDataGr.columns"
+        :data="tableDataGr.data">
+      </lb-table>
+    </div>
+
+    <div v-if="activeName==3">
+      <el-form :model="queryForm">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="证件号">
+              <el-input placeholder="证件号" maxlength="28" v-model="queryForm.zjh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="姓名/名称">
+              <el-input placeholder="" v-model.trim="queryForm.sqrmc" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" class="btnColRight">
+            <el-form-item>
+              <el-button type="primary" @click="handleSearch">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <lb-table
+        :page-size="pageData.pageSize" :calcHeight="435"
+        :current-page.sync="pageData.currentPage" :total="tableDataQy.total" @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange" :column="tableDataQy.columns"
+        :data="tableDataQy.data">
+      </lb-table>
+    </div>
+
   </dialogBox>
 </template>
 <script>
   import { mapGetters } from "vuex";
+  import table from "@/utils/mixin/table";
   import { getIdCardInfo } from '@/utils/operation.js'
+  import { dataGr, dataQy, sendThis } from "../../javascript/addQlrData";
   export default {
+    mixins: [table],
     props: {
       value: { type: Boolean, default: false },
       details: { type: Object, default: {} },
@@ -260,6 +331,7 @@
     },
     data () {
       return {
+        activeName: '1',
         myValue: this.value,
         ruleForm: {
           sqrlx: "",
@@ -290,7 +362,24 @@
           zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
           zjh: [{ required: true, message: "证件号", trigger: "blur" }],
         },
-      };
+        tableDataGr: {
+          total: 0,
+          columns: dataGr.columns(),
+          data: [],
+        },
+        queryForm: {
+          zjh: "",
+          sqrmc: ""
+        },
+        tableDataQy: {
+          total: 0,
+          columns: dataQy.columns(),
+          data: [],
+        },
+      }
+    },
+    mounted () {
+      sendThis(this);
     },
     watch: {
       value (val) {
@@ -304,6 +393,9 @@
       }
     },
     methods: {
+      handleClick (event, tab) { },
+      handlesGrSelect () { },
+      handleSearch () { },
       /**
        * @description: 身份证打卡器
        * @param {*} row

+/*
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-08-29 13:09:45
+ */
+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data1 extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "sqrmc",
+        label: "姓名/名称",
+      },
+      {
+        prop: "zjzl",
+        label: "证件种类",
+        render: (h, scope) => {
+          return (
+            <el-select
+              class="width100"
+              clearable
+              value={scope.row[scope.column.property]}
+              onChange={(val) => {
+                scope.row[scope.column.property] = val;
+              }}
+            >
+              {vm.dictData["A30"].map((option) => {
+                return (
+                  <el-option
+                    label={option.dname}
+                    value={option.dcode}
+                  ></el-option>
+                );
+              })}
+            </el-select>
+          );
+        },
+      },
+      {
+        prop: "zjh",
+        label: "证件号",
+      },
+      {
+        prop: "frmc",
+        label: "法人名称",
+      },
+      {
+        prop: "txdz",
+        label: "地址",
+      },
+      {
+        prop: "dh",
+        label: "联系电话",
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" onClick={() => { this.handlesGrSelect(scope.row) }}>使用</el-button>
+            </div>
+          )
+        }
+      },
+    ]
+  }
+
+}
+class data2 extends filter {
+  constructor() {
+    super()
+  }
+
+  columns () {
+    return [
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "sqrmc",
+        label: "姓名/名称",
+      },
+      {
+        prop: "zjzl",
+        label: "证件种类",
+        render: (h, scope) => {
+          return (
+            <el-select
+              class="width100"
+              clearable
+              value={scope.row[scope.column.property]}
+              onChange={(val) => {
+                scope.row[scope.column.property] = val;
+              }}
+            >
+              {vm.dictData["A30"].map((option) => {
+                return (
+                  <el-option
+                    label={option.dname}
+                    value={option.dcode}
+                  ></el-option>
+                );
+              })}
+            </el-select>
+          );
+        },
+      },
+      {
+        prop: "zjh",
+        label: "证件号",
+      },
+      {
+        prop: "frmc",
+        label: "法人名称",
+      },
+      {
+        prop: "txdz",
+        label: "地址",
+      },
+      {
+        prop: "dh",
+        label: "联系电话",
+      },
+      {
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" onClick={() => { this.handlesGrSelect(scope.row) }}>使用</el-button>
+            </div>
+          )
+        }
+      },
+    ]
+  }
+
+}
+let dataGr = new data1()
+let dataQy = new data2()
+export {
+  dataGr,
+  dataQy,
+  sendThis
+}

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-30 16:15:53
+ * @LastEditTime: 2023-09-01 09:22:02
 -->
 <template>
   <div class="slxx">
@@ -12,7 +12,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="140px">
+      label-width="190px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           申请业务信息
@@ -168,7 +168,31 @@
               <el-input v-model="ruleForm.lq.xdm"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)起始时间：">
+              <el-input v-model="ruleForm.lq.ldsyqssj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)结束时间：">
+              <el-input v-model="ruleForm.lq.ldsyjssj"></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.lq.xdm"></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="林地使用 (承包)期限：">
+              <el-input v-model="ruleForm.lq.ldsyqx"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="24">
             <el-form-item label="附记：">
               <el-input
                 v-model="ruleForm.lq.fj"
@@ -178,14 +202,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
+        <!-- <div class="slxx_title title-block">
           土地用途
           <div class="triangle"></div>
         </div>
         <tdytTable
           :ableOperation="viewEdit"
           :tableData="ruleForm.tdytqxList"
-          @upDateTdytxxList="upDateTdytxxList" />
+          @upDateTdytxxList="upDateTdytxxList" /> -->
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -238,7 +262,7 @@
           :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
 
-        <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
+        <div v-if="ruleForm.ywrList && ruleForm.sldy.djlx == '200'">
           <div class="slxx_title title-block">
             义务人信息
             <div class="triangle"></div>

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-30 14:57:59
+ * @LastEditTime: 2023-09-01 09:52:40
 -->
 <template>
   <div class="slxx">
@@ -11,7 +11,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="140px">
+      label-width="190px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           申请业务信息
@@ -167,7 +167,31 @@
               <el-input v-model="ruleForm.lq.xdm"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)起始时间：">
+              <el-input v-model="ruleForm.lq.ldsyqssj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)结束时间：">
+              <el-input v-model="ruleForm.lq.ldsyjssj"></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.lq.xdm"></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="林地使用 (承包)期限：">
+              <el-input v-model="ruleForm.lq.ldsyqx"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="24">
             <el-form-item label="附记：">
               <el-input
                 v-model="ruleForm.lq.fj"
@@ -177,14 +201,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
+        <!-- <div class="slxx_title title-block">
           土地用途
           <div class="triangle"></div>
-        </div>
-        <tdytTable
+        </div> -->
+        <!-- <tdytTable
           :ableOperation="viewEdit"
           :tableData="ruleForm.tdytqxList"
-          @upDateTdytxxList="upDateTdytxxList" />
+          @upDateTdytxxList="upDateTdytxxList" /> -->
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -237,7 +261,7 @@
           :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
 
-        <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
+        <div v-if="ruleForm.ywrList && ruleForm.sldy.djlx == '200'">
           <div class="slxx_title title-block">
             义务人信息
             <div class="triangle"></div>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:59:58
+ * @LastEditTime: 2023-09-01 09:18:46
 -->
 <template>
   <!-- 主体权利信息查询 -->
-  <div class="from-clues">
+  <div>
     <!-- 表单部分 -->
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="自然幢号">
-              <el-input placeholder="请输入自然幢号" maxlength="24" v-model="queryForm.zrzh" clearable class="width200px">
+              <el-input placeholder="请输入自然幢号" maxlength="24" v-model="queryForm.zrzh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="不动产单元号">
-              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width200px">
+              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="项目名称">
-              <el-input placeholder="" v-model="queryForm.xmmc" clearable class="width200px">
+              <el-input placeholder="" v-model="queryForm.xmmc" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>
@@ -38,14 +37,14 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="from-clues-content loadingtext">
-      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
+    <div class="loadingtext">
+      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="210"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
     </div>
-    <div class="submit_button">
+    <div class="submit_button" style="text-align:center">
       <el-button @click="$popupCacel">取消</el-button>
       <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
     </div>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-01 08:42:43
+ * @LastEditTime: 2023-09-01 10:11:39
 -->
 <template>
   <div class="from-clues">
@@ -104,9 +104,7 @@
        * @author: renchao
        */
       openDialog (item) {
-        this.$startLoading()
         bdcqzPreview(item).then(res => {
-          this.$endLoading()
           this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", {
             bsmSlsq: item.bsmSlsq,
             bsmBdcqz: item.bsmBdcqz