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

@@ -85,7 +85,7 @@
         transition: all 0.3s;
         transition: all 0.3s;
 
 
         &:hover {
         &:hover {
-          border: 1px solid $light-blue;
+          border: 1px solid $light-blue !important;
           color: $light-blue;
           color: $light-blue;
         }
         }
       }
       }
@@ -116,6 +116,7 @@
       justify-content: space-between;
       justify-content: space-between;
       padding: 0 20px;
       padding: 0 20px;
       margin: 20px 0;
       margin: 20px 0;
+      min-height: 50px;
 
 
       li {
       li {
         width: 23.5%;
         width: 23.5%;
@@ -137,7 +138,7 @@
         }
         }
 
 
         &:hover {
         &:hover {
-          border: 1px solid $light-blue;
+          border: 1px solid $light-blue !important;
           color: $light-blue;
           color: $light-blue;
         }
         }
 
 
@@ -173,26 +174,27 @@
 
 
         &:after {
         &:after {
           content: "";
           content: "";
-          width: 31%; //与块级的宽度相同
+          width: 48%; //与块级的宽度相同
           display: block;
           display: block;
           height: 0;
           height: 0;
         }
         }
 
 
         li {
         li {
-          width: 31%;
+          width: 48%;
           height: 50px;
           height: 50px;
           border: 1px solid $borderColor;
           border: 1px solid $borderColor;
           @include flex;
           @include flex;
           justify-content: space-between;
           justify-content: space-between;
           margin-left: 20px;
           margin-left: 20px;
           cursor: pointer;
           cursor: pointer;
+          margin-bottom: 15px;
 
 
           p {
           p {
             @include flex-center;
             @include flex-center;
           }
           }
 
 
           &:hover {
           &:hover {
-            border: 1px solid $light-blue;
+            border: 1px solid $light-blue !important;
             color: $light-blue;
             color: $light-blue;
           }
           }
 
 

@@ -33,7 +33,7 @@
         <div v-if="n >= 0">
         <div v-if="n >= 0">
           <div class="right-title">业务列表</div>
           <div class="right-title">业务列表</div>
           <ul>
           <ul>
-            <li v-for="(item, index) in ywList" :key="index" @click="handleYwSelect(item)"
+            <li v-for="(item, index) in ywList" :key="index" @click="handleSelectYw(item, ywList)"
               :class="item.cselect ? 'cactive' : ''">
               :class="item.cselect ? 'cactive' : ''">
               <p>
               <p>
                 {{ item.nodename }}
                 {{ item.nodename }}
@@ -47,10 +47,10 @@
         <div v-if="n == -1">
         <div v-if="n == -1">
           <div class="right-title">登记情形</div>
           <div class="right-title">登记情形</div>
           <ul class="registration">
           <ul class="registration">
-            <li v-for="(item, index) in djqxList" @click="handleSelect(item)" :class="item.cselect ? 'cactive' : ''"
-              :key="index">
+            <li v-for="(item, index) in djqxList" @click="handleSelectYw(item, djqxList)"
+              :class="item.cselect ? 'cactive' : ''" :key="index">
               <p>
               <p>
-                {{ item.name }}
+                {{ item.nodename }}
               </p>
               </p>
               <p :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)">
               <p :class="item.select ? 'active' : ''" @click.stop="handleCollection(item)">
                 <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
                 <i class="el-icon-star-off" :class="item.select ? 'active' : ''"></i>
@@ -78,7 +78,7 @@ export default {
         '常办业务', '一并申请', '补申请',
         '常办业务', '一并申请', '补申请',
       ],
       ],
       list: [],
       list: [],
-      djlxList: [{}],
+      djlxList: [],
       ywList: [
       ywList: [
         {
         {
           name: '国有建设用地使用权 || 首次登记+ 以出让方式取得',
           name: '国有建设用地使用权 || 首次登记+ 以出让方式取得',
@@ -117,9 +117,9 @@ export default {
         if (item.check) item.check = false
         if (item.check) item.check = false
       })
       })
     },
     },
-    // 业务列表选择
-    handleYwSelect (item) {
-      this.ywList.forEach(item => {
+    // 业务-登记情形选择
+    handleSelectYw (item, list) {
+      list.forEach(item => {
         item.cselect = false
         item.cselect = false
       })
       })
       item.cselect = !item.cselect
       item.cselect = !item.cselect
@@ -127,7 +127,6 @@ export default {
         this.btnDisabled = false
         this.btnDisabled = false
       }
       }
     },
     },
-
     handleList (list, obj) {
     handleList (list, obj) {
       list.forEach(item => {
       list.forEach(item => {
         if (item.check) item.check = false
         if (item.check) item.check = false
@@ -135,13 +134,18 @@ export default {
       this.n = -1
       this.n = -1
       this.$set(obj, 'check', true)
       this.$set(obj, 'check', true)
       this.getNextNode(obj.bsmSqyw)
       this.getNextNode(obj.bsmSqyw)
+      this.djqxList = []
+      this.djlxList = []
     },
     },
     // 获取下个节点类型
     // 获取下个节点类型
     getNextNode (bsmSqyw) {
     getNextNode (bsmSqyw) {
       getNextNode(bsmSqyw).then(res => {
       getNextNode(bsmSqyw).then(res => {
         let { djqx, djlx } = res.result
         let { djqx, djlx } = res.result
-        this.djqxList = djqx
-        this.djlxList = djlx
+        if (djqx) this.djqxList = djqx
+        if (djlx) this.djlxList = djlx
+        this.djqxList.forEach(item => {
+          this.$set(item, 'cselect', false)
+        })
       })
       })
     },
     },
     handleCollection (item) {
     handleCollection (item) {
@@ -161,7 +165,10 @@ export default {
       this.$set(item, 'select', true)
       this.$set(item, 'select', true)
       if (item.sffqlc == '1') {
       if (item.sffqlc == '1') {
         this.btnDisabled = false
         this.btnDisabled = false
+      } else {
+        this.getNextNode(item.bsmSqyw)
       }
       }
+      this.djqxList = []
     },
     },
     // 选择不动产信息
     // 选择不动产信息
     btnClick () {
     btnClick () {