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

@@ -16,6 +16,14 @@ Vue.prototype.$rules = rules
 // 全局加载
 // 全局加载
 Vue.prototype.$startLoading = startLoadingAddCount
 Vue.prototype.$startLoading = startLoadingAddCount
 Vue.prototype.$endLoading = endLoadingSubCount
 Vue.prototype.$endLoading = endLoadingSubCount
+
+// 弹框
+import { popupDialog, popupCacel } from "./utils/popup.js";
+// 全局加载
+Vue.prototype.$popupDialog = popupDialog
+Vue.prototype.$popupCacel = popupDialog
+
+
 import { theme } from "@/directive/theme.js"
 import { theme } from "@/directive/theme.js"
 Vue.directive("theme", theme)
 Vue.directive("theme", theme)
 Vue.directive('fo', {
 Vue.directive('fo', {

+/deep/.modifycollapse{
+  border: none;
+
+  .el-collapse-item {
+
+    .el-collapse-item__header {
+      margin-bottom: 10px;
+      background: #F3F4F7;
+      border: 1px solid #D9D9D9;
+      border-radius: 4px;
+      font-size: 16px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333333;
+      line-height: 18px;
+
+    }
+
+    .el-collapse-item__header::before {
+      content: "";
+      margin-left: 10px;
+      margin-right: 10px;
+      width: 4px;
+      height: 18px;
+      background: #2B7FF1;
+    }
+
+    .el-collapse-item__arrow {
+      color: #979797;
+      margin-left: 10px;
+    }
+
+
+  }
+}

@@ -23,7 +23,7 @@
   }
   }
 
 
   .el-dialog__body {
   .el-dialog__body {
-    max-height: 88vh;
+    max-height: 90vh;
     overflow-x: hidden;
     overflow-x: hidden;
     overflow-y: hidden;
     overflow-y: hidden;
   }
   }

@@ -135,7 +135,7 @@
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
-      <el-collapse accordion>
+      <el-collapse class="modifycollapse" accordion>
         <el-collapse-item  title="登记情形设置" name="1">
         <el-collapse-item  title="登记情形设置" name="1">
           <lb-table
           <lb-table
             :column="djqxCol"
             :column="djqxCol"
@@ -332,6 +332,7 @@ export default {
 <style lang='scss' scoped>
 <style lang='scss' scoped>
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
 @import "~@/styles/dialogBox.scss";
 @import "~@/styles/dialogBox.scss";
+@import "~@/styles/collapse.scss";
 
 
 .contentBox {
 .contentBox {
   height: 75vh;
   height: 75vh;

@@ -70,11 +70,11 @@ class data extends filter {
         label: "建筑物名称",
         label: "建筑物名称",
       },
       },
       {
       {
-        label: "权利性质",
+        label: "土地/房屋性质",
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div>
             <div>
-              {(scope.row.showQlxz) + (' / ') + (scope.row.fwxzbsm)}
+              {(scope.row.showQlxz) + (' / ') + (scope.row.fwxzmc)}
             </div>
             </div>
           )
           )
         }
         }
@@ -90,7 +90,7 @@ class data extends filter {
         }
         }
       },
       },
       {
       {
-        label: "用途",
+        label: "土地/房屋用途",
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div>
             <div>