Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 <template>
 <template>
-  <div class="jtfccx-edit">
   <div class="jtfccx-edit-con">
   <div class="jtfccx-edit-con">
     <b class="title"></b>
     <b class="title"></b>
     <b class="title">房屋状况</b>
     <b class="title">房屋状况</b>
@@ -31,17 +30,16 @@
       :pagination="false">
       :pagination="false">
     </lb-table>
     </lb-table>
   </div>
   </div>
-    </div>
 </template>
 </template>
 
 
 <script>
 <script>
-import { datas, sendThis } from "./infodata";
-import { getFwmxInfo } from "@/api/jtfc.js";
-export default {
+  import { datas, sendThis } from "./infodata";
+  import { getFwmxInfo } from "@/api/jtfc.js";
+  export default {
     props: {
     props: {
       formData: {
       formData: {
         type: Object,
         type: Object,
-      default: () => {},
+        default: () => { },
       },
       },
     },
     },
     data () {
     data () {
@@ -69,7 +67,7 @@ export default {
       };
       };
     },
     },
     mounted () {
     mounted () {
-    if(this.formData){
+      if (this.formData) {
         this.getDetailInfo()
         this.getDetailInfo()
       }
       }
     },
     },
@@ -79,14 +77,14 @@ export default {
        * @param {*} data
        * @param {*} data
        * @author: renchao
        * @author: renchao
        */
        */
-    setResult(data){
+      setResult (data) {
         this.resultData = data
         this.resultData = data
       },
       },
       /**
       /**
        * @description: getDetailInfo
        * @description: getDetailInfo
        * @author: renchao
        * @author: renchao
        */
        */
-    getDetailInfo(){
+      getDetailInfo () {
         this.$startLoading();
         this.$startLoading();
         getFwmxInfo({ sqcxBsm: this.formData.bsmSqcx }).then((res) => {
         getFwmxInfo({ sqcxBsm: this.formData.bsmSqcx }).then((res) => {
           this.$endLoading();
           this.$endLoading();
@@ -96,19 +94,22 @@ export default {
         })
         })
       }
       }
     }
     }
-};
+  };
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-
-.table1 {
+  @import "~@/styles/mixin.scss";
+  .jtfccx-edit-con {
+    max-height: 85vh;
+    overflow-y: scroll;
+  }
+  .table1 {
     border-spacing: 0;
     border-spacing: 0;
     border-collapse: collapse;
     border-collapse: collapse;
     width: 100%;
     width: 100%;
-}
+  }
 
 
-.table1 td {
+  .table1 td {
     border: 1px solid #acbed1;
     border: 1px solid #acbed1;
     height: 30px;
     height: 30px;
-}
+  }
 </style>
 </style>

@@ -345,7 +345,6 @@
           dyjlList: [],
           dyjlList: [],
         }
         }
       },
       },
-      //加载详细信息
       /**
       /**
        * @description: 加载详细信息
        * @description: 加载详细信息
        * @author: renchao
        * @author: renchao
@@ -416,7 +415,6 @@
           }
           }
         })
         })
       },
       },
-      //添加申请人
       /**
       /**
        * @description: 添加申请人
        * @description: 添加申请人
        * @author: renchao
        * @author: renchao
@@ -440,14 +438,12 @@
        * @author: renchao
        * @author: renchao
        */
        */
       remove (index, row, type) {
       remove (index, row, type) {
-        console.log(type, 'type');
         if (type == "sqr") {
         if (type == "sqr") {
           this.form.sqrList.splice(index, 1);
           this.form.sqrList.splice(index, 1);
         } else {
         } else {
           this.form.qlrList.splice(index, 1);
           this.form.qlrList.splice(index, 1);
         }
         }
       },
       },
-      //电话号码校验
       /**
       /**
        * @description: 电话号码校验
        * @description: 电话号码校验
        * @param {*} row
        * @param {*} row
@@ -463,7 +459,6 @@
           return true;
           return true;
         }
         }
       },
       },
-      //打印
       /**
       /**
        * @description: 打印
        * @description: 打印
        * @author: renchao
        * @author: renchao
@@ -479,7 +474,6 @@
           }
           }
         });
         });
       },
       },
-      //打开打印预览
       /**
       /**
        * @description: 打开打印预览
        * @description: 打开打印预览
        * @author: renchao
        * @author: renchao

@@ -104,7 +104,7 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleAdd () {
       handleAdd () {
-        this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", {
+        this.$popupDialog("登记情况", "sqcx/jtfc/components/addjtfc", {
           sqcxBsm: ''
           sqcxBsm: ''
         }, '80%')
         }, '80%')
       },
       },
@@ -114,7 +114,7 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleViewClick (row) {
       handleViewClick (row) {
-        this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", {
+        this.$popupDialog("登记情况", "sqcx/jtfc/components/addjtfc", {
           sqcxBsm: row.bsmSqcx
           sqcxBsm: row.bsmSqcx
         }, '80%')
         }, '80%')
       }
       }

@@ -131,6 +131,9 @@ export default {
         case "B-ZSXG":
         case "B-ZSXG":
           this.$popupDialog("证书修改", "workflow/components/dialog/zsxg", { bsmSlsq: this.bsmSlsq, }, '55%', true)
           this.$popupDialog("证书修改", "workflow/components/dialog/zsxg", { bsmSlsq: this.bsmSlsq, }, '55%', true)
           break;
           break;
+        case "B-SQD":
+
+          break;
         case "B6":
         case "B6":
           //根据编号获取对应信息
           //根据编号获取对应信息
           getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
           getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-18 13:57:34
+ * @LastEditTime: 2023-11-20 13:43:06
 -->
 -->
 <template>
 <template>
   <div class="container">
   <div class="container">