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

@@ -38,7 +38,21 @@ let mixin = {
     },
     // 详情
     handleEdit (row) {
-      this.title = row.rectypeName
+      let Title = ''
+      this.dicData['A21'].map(item => {
+        if (item.DCODE == row.DJLX || item.DCODE == row.djlx) {
+          Title = item.DNAME
+          return
+        }
+      })
+
+      this.dicData['A8'].map(item => {
+        if (item.DCODE == row.QLLX || item.DCODE == row.qllx) {
+          Title += '-' + item.DNAME
+          return
+        }
+      })
+      this.title = Title
       this.$refs.editLog.isShow(row);
     },
     // // 重置表单

@@ -7,11 +7,18 @@
     display: flex;
     position: relative;
     top: -2px;
-
     b {
-      @include flex-center;
-      flex: 1;
-      width: 100%;
+      font-weight: 200;
+      display: inline-block;
+      position: relative;
+      font-size: 24px;
+      top: -11px;
+      width: 38%;
+      height: 40px;
+      margin-left: 28px;
+      // @include flex-center;
+      display: flex;
+      justify-content: center;
     }
   }
 
@@ -28,7 +35,7 @@
   }
 
   .dialog_footer {
-    margin-top: 8px;
+    margin-bottom: 8px;
     @include flex-center;
   }
 
@@ -72,6 +79,9 @@
   background-size: 100% 100%;
   right: 40px;
   top: 33px;
+  &:hover{
+    box-shadow: inset 0px 0px 12px 0px #02D9FD;
+  }
 }
 
 .el-dialog__close {

@@ -66,7 +66,7 @@
 // refine element ui upload
 .el-input.is-disabled .el-input__inner {
   color: #FFFFFF !important;
-  // background-color: transparent !important;
+  background-color: transparent !important;
   border: 1px solid #224C7C !important;
 }
 

@@ -77,7 +77,7 @@
       </lb-table>
     </div>
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlCfdj'" />
+    <dataDetails ref="editLog" title="查封登记" :tabsActiveName="'qlfQlCfdj'" />
   </div>
 </template>
 <script>

@@ -72,7 +72,7 @@
       </lb-table>
     </div>
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlDyaq'" />
+    <dataDetails ref="editLog" title="抵押权登记" :tabsActiveName="'qlfQlDyaq'" />
   </div>
 </template>
 

@@ -73,7 +73,7 @@
       </lb-table>
     </div>
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlDyiq'" />
+    <dataDetails ref="editLog" title="地役权登记" :tabsActiveName="'qlfQlDyiq'" />
   </div>
 </template>
 

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="权属状态">
-              <el-select  class="width100" v-model="form.QSZT" placeholder="权属状态">
+              <el-select class="width100" v-model="form.QSZT" placeholder="权属状态">
                 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
@@ -33,8 +33,7 @@
         <el-row class="mt-10">
           <el-col :span="6">
             <el-form-item label="登记类型">
-              <el-select v-model="form.DJLX" clearable class="width100" ref="selectlandDJ"
-                @visible-change="isShowSelectOptions" placeholder="登记类型">
+              <el-select v-model="form.DJLX" clearable class="width100" ref="selectlandDJ" placeholder="请选择登记类型">
                 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
@@ -123,11 +122,6 @@ export default {
     }
   },
   methods: {
-    // 是否显示下拉框
-    isShowSelectOptions (e) {
-      if (!e) this.$refs.selectlandQL.blur()
-      if (!e) this.$refs.selectlandDJ.blur()
-    },
     async featchData () {
       try {
         this.form = Object.assign(this.form, this.formData)

@@ -22,7 +22,7 @@ class data extends filter {
       },
       {
         label: "登记类型",
-        width: 70,
+        width: 100,
         render: (h, scope) => {
           return (
             <div>

@@ -67,7 +67,7 @@
       </lb-table>
     </div>
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlYgdj'" />
+    <dataDetails ref="editLog" title="预告登记" :tabsActiveName="'qlfQlYgdj'" />
   </div>
 </template>
 

@@ -57,7 +57,7 @@
       </lb-table>
     </div>
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlYydj'" />
+    <dataDetails ref="editLog" title="异议登记" :tabsActiveName="'qlfQlYydj'" />
   </div>
 </template>
 

@@ -61,7 +61,7 @@
       </lb-table>
     </div>
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlZxdj'" />
+    <dataDetails ref="editLog" title="注销登记" :tabsActiveName="'qlfQlZxdj'" />
   </div>
 </template>
 

@@ -86,7 +86,6 @@ export default {
   methods: {
     // 初始化数据
     queryClick () {
-      // this.$startLoading();
       getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => {
         // this.$endLoading();
         let { records, total } = res.result
@@ -100,7 +99,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$startLoading()
         refreshDictCache().then(res => {
           if (res.code == 200) {
             let refech = this.$store.dispatch('dict/generateDic')