Merge branch 'dev'

@@ -174,7 +174,9 @@
       </div>
       </div>
     </div>
     </div>
     <!--    单元列表页面-->
     <!--    单元列表页面-->
-    <selectZrzH v-else :sqywInfo="formData" />
+    <div :style="{ height: lpbContentHight + 'px' }" v-else>
+      <selectZrzH :sqywInfo="formData" />
+    </div>
   </div>
   </div>
 </template>
 </template>
 
 

@@ -147,7 +147,7 @@
         if (this.unitData.length > 1) {
         if (this.unitData.length > 1) {
           let qllx = this.$route.query?.djywbm?.substring(0, 3);
           let qllx = this.$route.query?.djywbm?.substring(0, 3);
           switch (qllx) {
           switch (qllx) {
-            case 'A04':
+            case 'A04': case 'A06': case 'A08':
               this.showBatch = true;
               this.showBatch = true;
               this.batchButtonName = '房屋批量操作';
               this.batchButtonName = '房屋批量操作';
               break;
               break;

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-25 08:59:56
+ * @LastEditTime: 2023-10-16 13:35:55
  */
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { getPrintTemplateByCode } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
 import { uploadUndo } from "@/api/clxx";
@@ -159,14 +159,14 @@ export default {
         case "B8":
         case "B8":
           !window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
           !window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
             if (res.code === 200) {
             if (res.code === 200) {
-              this.$popupDialog('楼盘表', 'lpb/index', {
+              ywPopupDialog('楼盘表', 'lpb/index', {
                 bsm: res.result[0],
                 bsm: res.result[0],
                 onlyShow: false,
                 onlyShow: false,
                 unitData: window.unitData,
                 unitData: window.unitData,
                 bsmSlsq: this.bsmSlsq,
                 bsmSlsq: this.bsmSlsq,
                 showSave: true,
                 showSave: true,
                 djlx: window.djlx
                 djlx: window.djlx
-              }, '90%', true)
+              }, '85%', true, false)
             } else {
             } else {
               this.$message.error(res.message)
               this.$message.error(res.message)
             }
             }
@@ -174,13 +174,13 @@ export default {
             .catch((err) => {
             .catch((err) => {
               this.$message.error(err)
               this.$message.error(err)
             });
             });
-          window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', {
+          window.djlx && ywPopupDialog('楼盘表', 'lpb/zjgcdy', {
             onlyShow: false,
             onlyShow: false,
             unitData: window.unitData,
             unitData: window.unitData,
             bsmSlsq: this.bsmSlsq,
             bsmSlsq: this.bsmSlsq,
             showSave: true,
             showSave: true,
             djlx: window.djlx
             djlx: window.djlx
-          }, '90%', true)
+          }, '85%', true, false)
           break;
           break;
         // 图形定位
         // 图形定位
         case "B-TXDW":
         case "B-TXDW":

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-17 15:09:55
+ * @LastEditTime: 2023-10-16 11:14:29
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -29,7 +29,6 @@
           </el-col>
           </el-col>
           <el-col :span="6" class="btnColRight">
           <el-col :span="6" class="btnColRight">
             <el-form-item>
             <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="handleSearch">查询</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 17:08:30
+ * @LastEditTime: 2023-10-16 13:45:25
 -->
 -->
 <template>
 <template>
   <!-- 主体权利信息查询 -->
   <!-- 主体权利信息查询 -->
@@ -38,7 +38,7 @@
     </div>
     </div>
     <!-- 表格 -->
     <!-- 表格 -->
     <div class="loadingtext">
     <div class="loadingtext">
-      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="this.zrzbsm ? 390 : 290"
+      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="this.zrzbsm ? 390 : 260"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         :data="tableData.data">
         :data="tableData.data">
@@ -52,7 +52,7 @@
 </template>
 </template>
 <script>
 <script>
   import store from '@/store/index.js'
   import store from '@/store/index.js'
-  import { ywPopupDialog,popupCacel } from "@/utils/popup.js";
+  import { ywPopupDialog, popupCacel } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectAllHInfo.js";
   import { datas, sendThis } from "../javascript/selectAllHInfo.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
   import table from "@/utils/mixin/table";
@@ -131,9 +131,9 @@
             this.close()
             this.close()
           } else {
           } else {
             if (res.result && res.result.length > 0) {
             if (res.result && res.result.length > 0) {
-              this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
             } else {
             } else {
-              this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
             }
             }
           }
           }
         }).catch(() => {
         }).catch(() => {
@@ -145,7 +145,7 @@
        * @param {*} val
        * @param {*} val
        * @author: renchao
        * @author: renchao
        */
        */
-      close(){
+      close () {
         popupCacel()
         popupCacel()
       },
       },
       /**
       /**