Merge branch 'dev'

@@ -10,7 +10,7 @@
 
 <template>
   <div :class="['lb-table', customClass]">
-    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable" :border='border'
+    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '45px' }" ref="elTable" :border='border'
       :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
@@ -24,7 +24,7 @@
       </lb-column>
     </el-table>
 
-    <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '50px' }"
+    <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '45px' }"
       :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-15 10:03:39
+ * @LastEditTime: 2023-11-15 16:18:58
  */
 import Vue from 'vue'
 import App from './App'
@@ -55,7 +55,7 @@ import 'quill/dist/quill.bubble.css'
 Vue.use(VueQuillEditor)
 
 import * as filters from './filters' // global filters
-Vue.use(Element, { size: 'mini', zIndex: 1000 })
+Vue.use(Element, { size: 'small', zIndex: 1000 })
 Vue.use(Base)
 Object.keys(filters).forEach(key => {
     Vue.filter(key, filters[key])

@@ -270,13 +270,4 @@
 // 整体配置
 .el-form-item--mini.el-form-item {
   margin-bottom: 10px;
-}
-
-.vue-treeselect__control {
-  height: 28px !important;
-}
-
-.vue-treeselect__placeholder,
-.vue-treeselect__single-value {
-  line-height: 28px !important;
 }
\ No newline at end of file

@@ -101,7 +101,7 @@
     border-bottom: 1px solid $borderColor;
     padding-left: 10px;
     padding-bottom: 5px;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
     margin-top: 5px;
     font-size: 16px;
     font-weight: 500;

@@ -47,7 +47,7 @@
   border-bottom: 1px solid $borderColor;
   padding-left: 10px;
   padding-bottom: 5px;
-  margin-bottom: 10px;
+  margin-bottom: 5px;
   margin-top: 5px;
   font-size: 16px;
   font-weight: 500;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-03 14:48:37
+ * @LastEditTime: 2023-11-15 15:47:29
 -->
 <template>
   <!-- 受理信息 -->
@@ -749,17 +749,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

 <template>
-  <div class="jtfccx-edit">
+  <div class="jtfccx-edit" style="margin-top:-5px">
     <div class="jtfccx-edit-con">
       <b class="title">申请信息</b>
       <el-form :model="form" label-width="120px">
@@ -28,7 +28,7 @@
       <b class="title">权利人</b>
       <el-table
         :data="form.qlrList"
-        height="160"
+        height="130"
         border
         :cell-style="{ textAlign: 'center' }"
         :header-cell-style="{textAlign: 'center'}"
@@ -323,7 +323,6 @@
       }
     },
     methods: {
-      // 字典
       /**
        * @description: 字典
        * @param {*} val
@@ -362,7 +361,6 @@
           }
         });
       },
-      //查询结果
       /**
        * @description: 查询结果
        * @author: renchao
@@ -378,7 +376,6 @@
           }
         });
       },
-      //重置
       /**
        * @description: 重置
        * @author: renchao
@@ -502,25 +499,24 @@
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";
   @import "~@/styles/public.scss";
-
   .title {
-    padding-bottom: 10px;
-    margin-bottom: 10px;
+    padding-bottom: 5px;
+    margin-bottom: 5px;
     display: block;
     border-bottom: 1px solid $borderColor;
   }
-
+  .jtfccx-edit-con {
+    max-height: 80vh;
+    overflow-y: scroll;
+  }
   .jtfccx-edit {
     @include flex;
     flex-direction: column;
     overflow-y: hidden;
-    max-height: 85vh;
     padding: 0 2px;
 
     .submit-button {
       text-align: center;
-      height: 52px;
-      padding-top: 10px;
       background-color: #fff;
     }
   }

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-06-14 14:48:35
+ * @LastEditTime: 2023-11-15 16:29:28
  */
 import filter from '@/utils/filter.js'
 class data extends filter {
@@ -16,7 +16,7 @@ class data extends filter {
       },
       {
         prop: 'bdcqzh',
-        width: '110',
+        width: 150,
         label: '不动产权证号',
       },
       {
@@ -33,7 +33,7 @@ class data extends filter {
       },
       {
         prop: 'bdcdyh',
-        width: '110',
+        width: 150,
         label: '不动产单元号',
       },
       {
@@ -47,14 +47,16 @@ class data extends filter {
       {
         prop: 'zjhm',
         label: '证件号',
+        width: 120,
       },
       {
         prop: 'fdzl',
+        width: 120,
         label: '房地坐落',
       },
       {
         prop: 'fwmj',
-        width: '120',
+        width: 120,
         label: '建筑面积（㎡）',
       },
       {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 11:27:00
+ * @LastEditTime: 2023-11-15 16:28:13
 -->
 <template>
   <div class="from-clues">
@@ -106,7 +106,7 @@
       handleAdd () {
         this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", {
           sqcxBsm: ''
-        })
+        }, '80%')
       },
       /**
        * @description: handleAdd
@@ -116,7 +116,7 @@
       handleViewClick (row) {
         this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", {
           sqcxBsm: row.bsmSqcx
-        })
+        }, '80%')
       }
     }
   }

@@ -100,73 +100,75 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col>
-          <lb-table :column="dyjlcolumns" :data="form.dyjlList" :maxHeight="200" heightNumSetting :pagination="false">
-          </lb-table>
-        </el-col>
+        <lb-table :column="dyjlcolumns" :data="form.dyjlList" :maxHeight="200" heightNumSetting :pagination="false">
+        </lb-table>
       </el-row>
     </el-form>
   </div>
 </template>
 
 <script>
-import { getJtfcInfo } from "@/api/jtfc.js";
-import { datas, sendThis } from "./sqcxjlInfodata";
+  import { getJtfcInfo } from "@/api/jtfc.js";
+  import { datas, sendThis } from "./sqcxjlInfodata";
 
-export default {
-  props: ["formData"],
-  data () {
-    return {
-      form: {},
-      ruleForm: {
-        cxyt: "",
-        ycyrgx: 1,
-        cxlx: "1", //查询类型 1：房产查询 2：登记簿查询
-      },
+  export default {
+    props: ["formData"],
+    data () {
+      return {
+        form: {},
+        ruleForm: {
+          cxyt: "",
+          ycyrgx: 1,
+          cxlx: "1", //查询类型 1：房产查询 2：登记簿查询
+        },
 
-      sqrData: {
-        columns: datas.sqrcolumns(),
-        data: [],
-      },
+        sqrData: {
+          columns: datas.sqrcolumns(),
+          data: [],
+        },
 
-      cxjgData: {
-        columns: datas.cxjgcolumns(),
-        data: [],
-      },
+        cxjgData: {
+          columns: datas.cxjgcolumns(),
+          data: [],
+        },
 
-      qlrData: {
-        columns: datas.qlrcolumns(),
-        data: [],
-      },
-      dyjlcolumns: datas.dyjlcolumns(),
-    };
-  },
+        qlrData: {
+          columns: datas.qlrcolumns(),
+          data: [],
+        },
+        dyjlcolumns: datas.dyjlcolumns(),
+      };
+    },
 
-  mounted () {
-    sendThis(this);
-    var sqcxBsm = this.formData.sqcxBsm;
+    mounted () {
+      sendThis(this);
+      var sqcxBsm = this.formData.sqcxBsm;
 
-    getJtfcInfo({ sqcxBsm: sqcxBsm })
-      .then((res) => {
-        if (res.code == 200) {
-          this.form = res.result;
-          this.sqrData.data = res.result.sqxx;
-          this.qlrData.data = res.result.qlrxx;
-          this.cxjgData.data = res.result.djSqcxCxjgDOList;
-          this.cxbh = res.result.djSqcxDO.cxbh;
-        }
-      })
-      .catch((error) => {
-        console.log(error);
-      });
-  },
-  methods: {},
-};
+      getJtfcInfo({ sqcxBsm: sqcxBsm })
+        .then((res) => {
+          if (res.code == 200) {
+            this.form = res.result;
+            this.sqrData.data = res.result.sqxx;
+            this.qlrData.data = res.result.qlrxx;
+            this.cxjgData.data = res.result.djSqcxCxjgDOList;
+            this.cxbh = res.result.djSqcxDO.cxbh;
+          }
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+    },
+    methods: {},
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
 
-/deep/.el-form-item {
-  margin-bottom: 0 !important;
-}
+  /deep/.el-form-item {
+    margin-bottom: 0 !important;
+  }
+  .sqcxjlInfo {
+    max-height: 85vh;
+    overflow-y: scroll;
+  }
 </style>

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-25 15:11:12
+ * @LastEditTime: 2023-11-15 15:46:54
 -->
 <template>
   <div class="slxx">
@@ -566,17 +566,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 13:42:57
+ * @LastEditTime: 2023-11-15 15:46:58
 -->
 <template>
   <div class="slxx">
@@ -686,17 +686,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 13:32:47
+ * @LastEditTime: 2023-11-15 15:47:37
 -->
 <template>
   <div class="slxx">
@@ -593,17 +593,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 13:41:15
+ * @LastEditTime: 2023-11-15 15:47:02
 -->
 <template>
   <div class="slxx">
@@ -498,17 +498,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

@@ -530,17 +530,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-20 14:25:52
+ * @LastEditTime: 2023-11-15 15:47:55
 -->
 <template>
   <div class="slxx">
@@ -557,17 +557,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-20 14:23:42
+ * @LastEditTime: 2023-11-15 15:48:15
 -->
 <template>
   <div class="slxx">
@@ -575,17 +575,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

@@ -517,17 +517,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;

@@ -455,17 +455,6 @@
     height: 50px;
   }
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
     text-align: center;
     padding-top: 10px;