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

@@ -220,12 +220,13 @@ export default {
       overflow-x: scroll;
     }
 
-    .xxTable > tr th:not(:first-child) {
-      width: 223px;
-    }
+    // .xxTable > tr th:not(:first-child) {
+    //   width: 223px;
+    // }
     .xxTable > tr:first-child th {
       width: 140px;
     }
+
     .xxTable {
       border-spacing: 1px;
       tr > th {

@@ -176,11 +176,20 @@ export default {
           this.$store.dispatch("djbxx/setDjbxx", obj);
           _this.isDialog = true;
 
-          // if (scope.row.qllxmc == "预告买卖登记") {
-          //   this.$refs.djbxxDialog.showTab = "ygdj";
-          // } else if (scope.row.qllx == "查封登记") {
-          //   this.$refs.djbxxDialog.showTab = "cfdj";
-          // }
+          // 弹窗打开,自动切换到对应的登记类型
+          if (scope.row.qllxmc == "国有建设用地使用权") {
+            this.$refs.djbxxDialog.showType = "JSYDSYQ";
+          } else if (scope.row.qllxmc == "抵押权") {
+            this.$refs.djbxxDialog.showType = "DYAQ";
+          } else if (scope.row.qllxmc == "地役权") {
+            this.$refs.djbxxDialog.showType = "DYIQ";
+          } else if (scope.row.qllxmc == "预告登记") {
+            this.$refs.djbxxDialog.showType = "YGDJ";
+          } else if (scope.row.qllxmc == "异议登记") {
+            this.$refs.djbxxDialog.showType = "YYDJ";
+          } else if (scope.row.qllxmc == "查封登记") {
+            this.$refs.djbxxDialog.showType = "CFDJ";
+          }
         });
     },
   },