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

# Conflicts:
#	src/components/tanchuang/index.vue

@@ -4,14 +4,14 @@
       <div class="ls-mask-window" :style="{'width':width,'height':height}">
         <div class="ls-head">
           <div class="ls-title" :style="{'text-align':titleStyle}">
-            <svg-icon v-if="iconClass!=''" :icon-class='iconClass'  />
+            <svg-icon v-if="iconClass!=''" :icon-class='iconClass' />
             <b>{{title}}</b>
           </div>
           <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />
         </div>
-       
+
         <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}">
-          <component :is="editItem" ref='childRef' @loading='loadingFn' :formData='formData' />
+          <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />
         </div>
         <div class="ls-mask-footer" v-if='btnShow'>
           <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button>
@@ -39,24 +39,25 @@ export default {
       width: "75%",
       height: "auto",
       formData: "",//父组件传递的参数 负责传给子组件
-      contentHeight:"",
-      iconClass:"",
+      contentHeight: "",
+      iconClass: "",
+      key: 0
     }
   },
-  
   props: {
     loading: { type: Boolean, default: false },
   },
   watch: {
     isShow (a, b) {
+      this.key++
       this.editItem = this.loadViewFn(this.editItem)
     },
   },
-  mounted(){
-  //  计算滚动条高度
-   setTimeout(() => {
-    this.contentHeight = this.$refs.contentRef.offsetHeight
-   }, 1000);
+  mounted () {
+    //  计算滚动条高度
+    setTimeout(() => {
+      this.contentHeight = this.$refs.contentRef.offsetHeight
+    }, 1000)
   },
   methods: {
     onCancel () {
@@ -81,7 +82,7 @@ export default {
         require.ensure([], () =>
           r(require(`@/views/${view}.vue`))
         );
-    },
+    }
   }
 }
 </script>
@@ -114,15 +115,18 @@ export default {
 .ls-mask-window b {
   padding-left: 5px;
 }
-.ls-title{
+
+.ls-title {
   padding: 16px;
   background: linear-gradient(2deg, #00CCFF, transparent);
   color: #ffffff;
-  
+
 }
-.ls-title .svg-icon{
-    font-size: 18px;
-  }
+
+.ls-title .svg-icon {
+  font-size: 18px;
+}
+
 .ls-mask-content {
   padding: 20px;
   width: 100%;
@@ -136,11 +140,11 @@ export default {
   justify-content: center;
   width: 100%;
   box-shadow: 0px 0px 2px 0px;
-    border-radius: 0 0 10px 10px;
+  border-radius: 0 0 10px 10px;
 }
 
 
-/deep/.closeStyle{
+/deep/.closeStyle {
   position: absolute;
   top: 17px;
   right: 12px;
@@ -148,10 +152,12 @@ export default {
   cursor: pointer;
   color: #ffffff;
 }
+
 /deep/.el-loading-mask {
   background: none;
 }
-/deep/.el-button{
+
+/deep/.el-button {
   margin: 15px 10px;
   width: 75px;
 }

@@ -101,6 +101,7 @@
 .iconName {
   line-height: 24px;
   font-size: 12px;
+  white-space: nowrap;
 }
 
 .container {

@@ -153,11 +153,8 @@ export default {
         case "B0":
           let type = queueDjywmc(this.$route.query.sqywbm)
           this.$popup({
-            title: '提示', // 弹窗标题
-            editItem: 'ywbl/ywsq/components/' + type,
-            formData: this.formData, //父组件传给子组件的参数  
-            cancel: function () { }, //取消事件的回调
-            confirm: function () { }, //确认事件的回调
+            title: '查询权利信息',
+            editItem: 'ywbl/ywsq/components/houseOwnership',
           })
           break;
         case "B1":

@@ -8,35 +8,21 @@
       </el-tabs>
       <el-form :model="queryForm" ref="queryForm" label-width="100px">
         <el-row>
-          <el-col :span="5">
-            <el-form-item label="权利类型" label-width="70px">
-              <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
-                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="不动产单元号">
               <el-input placeholder="不动产单元号" v-model="queryForm.bdcdyh" clearable>
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
-            <el-form-item label="业务号" label-width="70px">
-              <el-input placeholder="业务号" v-model="queryForm.ywh" clearable>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="不动产权证号">
-              <el-input placeholder="不动产权证号" v-model="queryForm.bdcqzh" clearable>
+          <el-col :span="6">
+            <el-form-item label="坐落">
+              <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width300px">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4" class="btnCol">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick()">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -58,7 +44,7 @@
 <script>
 //国有建设用地使用权/房屋使用权
 import { mapGetters } from 'vuex'
-import { datas, sendThis } from "../javascript/houseOwnership.js";
+import { datas, sendThis } from "../javascript/fwsyq.js";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
@@ -92,7 +78,7 @@ export default {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
+    queryClick () {
       this.queryForm.sqywbm = this.djywbm;
       selectFwsyq({ ...this.queryForm, ...this.pageData, fwfl: this.activeName }).then((res) => {
         if (res.code === 200) {
@@ -104,7 +90,7 @@ export default {
     },
     handleTabClick () {
       this.pageData.currentPage = 1
-      this.fetchData()
+      this.queryClick()
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {

@@ -11,8 +11,8 @@ export function queueDjywmc (djywbm) {
         case "A03400":
             vm = "jsydsyq200";
             break;
-        case "A04100":
-            vm = "houseOwnership";
+        case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
+            vm = "fwsyq";
             break;
         case "A05200":
         case "A05300":

@@ -116,9 +116,9 @@ export default {
     // 业务-登记情形选择
     handleSelectYw (item, list) {
       list.forEach(item => {
-        item.cselect = false
+        this.$set(item, 'cselect', false)
       })
-      item.cselect = !item.cselect
+      item.cselect = true
       this.$store.dispatch('ywbl/setDjqxObj', {
         'djqxbm': item.nodecode,
         'djqxmc': item.nodename,
@@ -141,18 +141,18 @@ export default {
       this.djlxList = []
     },
     // 获取下个节点类型
-    getNextNode (bsmSqyw) {
+    getNextNode (bsmSqyw, type) {
       getNextNode(bsmSqyw).then(res => {
         if (res.result.djqx) this.djqxList = res.result.djqx
         if (res.result.djlx) this.djlxList = res.result.djlx
-        this.djqxList.forEach(item => {
-          this.$set(item, 'cselect', false)
-          this.$set(item, 'select', false)
-        })
-        this.djlxList.forEach(item => {
-          this.$set(item, 'cselect', false)
-          this.$set(item, 'select', false)
-        })
+        if (type) {
+          this.djqxList.forEach(item => {
+            this.$set(item, 'cselect', false)
+          })
+          this.djlxList.forEach(item => {
+            this.$set(item, 'cselect', false)
+          })
+        }
       })
     },
     handleCollection (item) {
@@ -165,6 +165,7 @@ export default {
               message: '收藏成功！',
               type: 'success'
             })
+            that.getDataList()
           }
         })
       } else {
@@ -175,6 +176,7 @@ export default {
               message: '取消收藏成功！',
               type: 'success'
             })
+            that.getDataList()
           }
         })
       }
@@ -197,7 +199,7 @@ export default {
         this.$store.dispatch('ywbl/setBsmSqyw', item.bsmSqyw)
         this.$store.dispatch('ywbl/setDjywbm', item.djywbm)
       } else {
-        this.getNextNode(item.bsmSqyw)
+        this.getNextNode(item.bsmSqyw, false)
       }
       this.djqxList = []
     },