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

@@ -29,15 +29,29 @@ export function getNextNode (bsmSqyw) {
 }
 
 /* 
-业务办理-选择单元-根据条件进行列表查询
+业务办理-选择单元-根据条件进行列表查询-国有建设用地使用权
 */
 export function selectScBdcdy (data) {
     return request({
         url: '/ywbl/ywsq/selectScBdcdy',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
+
+/* 
+业务办理-选择单元-根据条件进行列表查询-房屋所有权
+*/
+export function selectFwsyq (data) {
+    return request({
+        url: 'ywbl/ywsq/selectFwsyq',
+        method: 'post',
+        data,
+        showLoading: true
+    })
+}
+
 // 待办箱列表查询接口
 export function searchTaskToDo (data) {
     return request({
@@ -62,7 +76,8 @@ export function startBusinessFlow (data) {
     return request({
         url: '/business/workFlow/startBusinessFlow',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 
@@ -83,7 +98,8 @@ export function selectQlxx (data) {
     return request({
         url: '/ywbl/ywsq/selectQlxx',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 
@@ -93,7 +109,8 @@ export function selectDiyaq (data) {
     return request({
         url: '/ywbl/ywsq/selectDiyaq',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 
@@ -103,7 +120,8 @@ export function selectCfdj (data) {
     return request({
         url: '/ywbl/ywsq/selectCfdj',
         method: 'post',
-        data
+        data,
+        showLoading: true
     })
 }
 /* 

@@ -59,7 +59,7 @@ export default {
     },
     heightNum: {
       type: Number,
-      default: 260,
+      default: 275,
     },
     maxHeight: {
       type: Number,

@@ -3,14 +3,17 @@
     <div class="ls-mask" v-loading="loading">
       <div class="ls-mask-window" :style="{'width':width,'height':height}">
         <div class="ls-head">
-          <div class="ls-title" :style="{'text-align':titleStyle}"><b>{{title}}</b></div>
-          <i class="el-icon-close" @click="onCancel"></i>
+          <div class="ls-title" :style="{'text-align':titleStyle}">
+            <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">
+        <div class="ls-mask-footer" v-if='btnShow'>
           <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button>
           <el-button @click="onCancel">{{cancelText}}</el-button>
         </div>
@@ -23,6 +26,7 @@ export default {
   name: 'index',
   data () {
     return {
+      btnShow:false,
       title: '提示',
       cancelText: '取消',
       confirmText: '确认',
@@ -35,23 +39,25 @@ export default {
       width: "75%",
       height: "auto",
       formData: "",//父组件传递的参数 负责传给子组件
-      contentHeight:"",
+      contentHeight: "",
+      iconClass: "",
+      key: 0
     }
   },
-  
   props: {
     loading: { type: Boolean, default: false },
   },
   watch: {
     isShow (a, b) {
+      this.key++
       this.editItem = this.loadViewFn(this.editItem)
     },
   },
-  mounted(){
+  mounted () {
     //  计算滚动条高度
     setTimeout(() => {
       this.contentHeight = this.$refs.contentRef.offsetHeight
-   }, 1000);
+    }, 1000)
   },
   methods: {
     onCancel () {
@@ -76,7 +82,7 @@ export default {
         require.ensure([], () =>
           r(require(`@/views/${view}.vue`))
         );
-    },
+    }
   }
 }
 </script>
@@ -105,40 +111,42 @@ export default {
   transform: translate(-50%, -50%);
   border-radius: 10px;
 }
-.ls-head{
-  position: relative;
-}
+
 .ls-mask-window b {
-  padding-left: 12px;
+  padding-left: 5px;
 }
-.ls-title{
-  padding: 20px;
-  background: #1E9FFF;
+
+.ls-title {
+  padding: 16px;
+  background: linear-gradient(2deg, #00CCFF, transparent);
   color: #ffffff;
+
+}
+
+.ls-title .svg-icon {
+  font-size: 18px;
 }
+
 .ls-mask-content {
   padding: 20px;
-  text-align: center;
-  position: absolute;
   width: 100%;
   overflow: scroll;
+  max-height: 500px;
 }
 
 .ls-mask-footer {
   height: 65px;
-  border-top: 1px solid #f0f0f0;
   display: flex;
   justify-content: center;
-  position: absolute;
   width: 100%;
-  bottom: 0px;
-  right: 0px;
-  background: #f3f3f3;
+  box-shadow: 0px 0px 2px 0px;
+  border-radius: 0 0 10px 10px;
 }
 
-/deep/.el-icon-close {
+
+/deep/.closeStyle {
   position: absolute;
-  top: 20px;
+  top: 17px;
   right: 12px;
   font-size: 20px;
   cursor: pointer;
@@ -148,8 +156,10 @@ export default {
 /deep/.el-loading-mask {
   background: none;
 }
-/deep/.el-button{
+
+/deep/.el-button {
   margin: 15px 10px;
+  width: 75px;
 }
 </style>
   
\ No newline at end of file

@@ -9,10 +9,12 @@
           height:"", //弹窗的高度
           editItem: 'ywbl/dbx/aa', // 子组件的路径  相当于你平时img取的路径
           formData:this.formData, //父组件传给子组件的参数  
+          btnShow:false,//按钮显隐 false隐藏 true显示
           confirmText:"" // 确认按钮的文字
           cancelText:"" //取消按钮的文字
           cancel: function () {}, //取消事件的回调
           confirm: function () {}, //确认事件的回调
+          iconClass:"",//标题前面icon图标名称
         })    
 3.子组件的方法名字必须统一为 childFn()
 4.子组件切记props接收 父组件传参formData  

+<svg t="1665567795982" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2615" width="200" height="200"><path d="M512 74.666667C270.933333 74.666667 74.666667 270.933333 74.666667 512S270.933333 949.333333 512 949.333333 949.333333 753.066667 949.333333 512 753.066667 74.666667 512 74.666667z m0 810.666666c-204.8 0-373.333333-168.533333-373.333333-373.333333S307.2 138.666667 512 138.666667 885.333333 307.2 885.333333 512 716.8 885.333333 512 885.333333z" p-id="2616"></path><path d="M657.066667 360.533333c-12.8-12.8-32-12.8-44.8 0l-102.4 102.4-102.4-102.4c-12.8-12.8-32-12.8-44.8 0-12.8 12.8-12.8 32 0 44.8l102.4 102.4-102.4 102.4c-12.8 12.8-12.8 32 0 44.8 6.4 6.4 14.933333 8.533333 23.466666 8.533334s17.066667-2.133333 23.466667-8.533334l102.4-102.4 102.4 102.4c6.4 6.4 14.933333 8.533333 23.466667 8.533334s17.066667-2.133333 23.466666-8.533334c12.8-12.8 12.8-32 0-44.8l-106.666666-100.266666 102.4-102.4c12.8-12.8 12.8-34.133333 0-46.933334z" p-id="2617"></path></svg>
\ No newline at end of file

@@ -11,6 +11,10 @@ const getters = {
   addRoutes: state => state.permission.addRoutes,
   addDict: state => state.dict.addDict,
   dictData: state => state.dict.dictData,
-  djbxx: state => state.djbxx.djbxx
+  djbxx: state => state.djbxx.djbxx,
+  // 业务办理
+  bsmSqyw: state => state.ywbl.bsmSqyw,
+  djqxObj: state => state.ywbl.djqxObj,
+  djywbm: state => state.ywbl.djywbm
 }
 export default getters

+const state = {
+  bsmSqyw: '',
+  djqxObj: {
+    djqxbm: "",
+    djqxmc: ""
+  },
+  djywbm: ''
+}
+const mutations = {
+  SET_BSMSQYW: (state, data) => {
+    state.bsmSqyw = data
+  },
+  SET_DJQXOBJ: (state, data) => {
+    state.djqxObj = data
+  },
+  SET_DJYWBM: (state, data) => {
+    state.djywbm = data
+  },
+}
+
+const actions = {
+  setBsmSqyw ({ commit }, data) {
+    commit('SET_BSMSQYW', data)
+  },
+  setDjqxObj ({ commit }, data) {
+    commit('SET_DJQXOBJ', data)
+  },
+  setDjywbm ({ commit }, data) {
+    commit('SET_DJYWBM', data)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}

@@ -7,7 +7,7 @@
 
     &-header {
         width: 100%;
-        padding: 10px 10px 3px 10px;
+        padding: 10px;
         box-sizing: border-box;
         background: #FFFFFF;
         border-radius: 2px;
@@ -18,7 +18,7 @@
         display: flex;
         font-size: 12px;
         flex-wrap: wrap;
-        line-height: 36px;
+        padding-top: 10px;
 
         span {
             display: flex;

@@ -229,7 +229,7 @@ export default {
     height: calc(100% - 80px);
     align-items: center;
     background: rgba(194, 190, 190, 0.1);
-
+    overflow: scroll;
     img {
       display: block;
       object-fit: scale-down;

@@ -59,7 +59,8 @@ export default {
       myValue: this.value,
       ruleForm: {
         cxyt: '',
-        ycyrgx: 1
+        ycyrgx: 1,
+        cxlx: '1' //查询类型 1：房产查询 2：登记簿查询
       },
       dataList: [{
         sqrxm: '',

@@ -59,7 +59,6 @@ import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./dydjbdata";
 export default {
   name: "dydjb",
-  components: {},
   mixins: [table],
   mounted () {
     sendThis(this);

@@ -23,8 +23,15 @@ class data extends filter {
         }
       },
       {
-        prop: "cxlx",
         label: "查询类型",
+        render: (h, scope) => {
+          switch (scope.row.cxlx) {
+            case '1':
+              return <div>家庭房产</div>
+            case '2':
+              return <div>登记簿</div>
+          }
+        }
       },
       {
         prop: "cxbh",
@@ -35,19 +42,28 @@ class data extends filter {
         label: "查询时间",
       },
       {
-        prop: "slry",
+        prop: "cxr",
         label: "受理人员",
       },
       {
-        prop: "sqr",
+        prop: "sqrxm",
         label: "申请人",
       },
       {
-        prop: "yqlrgx",
         label: "与权利人的关系",
+        render: (h, scope) => {
+          switch (scope.row.ycyrgx) {
+            case '1':
+              return <div>权利人</div>
+            case '2':
+              return <div>产权利害关系人</div>
+            case '3':
+              return <div>委托人</div>
+          }
+        }
       },
       {
-        prop: "qlr",
+        prop: "qlrxm",
         label: "权利人",
       },
       {

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

@@ -74,6 +74,7 @@ import {
 } from "@/api/fqsq.js"
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
 import { getForm } from "./flowform.js"
+import { queueDjywmc } from '@/views/ywbl/ywsq/slectBdcdata.js';
 export default {
   data () {
     return {
@@ -149,6 +150,13 @@ export default {
       //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
       let that = this;
       switch (item.value) {
+        case "B0":
+          let type = queueDjywmc(this.$route.query.sqywbm)
+          this.$popup({
+            title: '查询权利信息',
+            editItem: 'ywbl/ywsq/components/houseOwnership',
+          })
+          break;
         case "B1":
           getWorkFlowImage(this.bsmSlsq).then(res => {
             this.imgSrc = URL.createObjectURL(res)

@@ -76,10 +76,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式：" prop="qlsdfs"> 
-              <el-select disabled v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择权利设定方式">
-                <el-option v-for="item in qlsdfsOption" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
+              <el-input disabled v-model="ruleForm.qlsdfsmc"></el-input>            
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,8 +186,6 @@ export default {
   data () {
     return {
       disabled: true,
-      tdytOption: [],
-      qlsdfsOption: [],
       czrOptions: [],
       ruleForm: {
         ywh: "",

@@ -59,10 +59,6 @@ import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
 export default {
-  props: {
-    bsmSqyw: { type: String, default: '' },
-    djywbm: { type: String, default: "" }
-  },
   mixins: [table, jump],
   data () {
     return {
@@ -77,21 +73,18 @@ export default {
       saveloding: false
     };
   },
-  watch: {
-    bsmSqyw (val) {
-      this.fetchData()
-    },
-  },
   mounted () {
-    sendThis(this);
+    sendThis(this)
+  },
+  computed: {
+    ...mapGetters([ 'bsmSqyw', 'djywbm'])
   },
   methods: {
     closeDialog () {
       this.$emit("closeDialog")
     },
     fetchData () {
-      if (this.bsmSqyw) {
-        this.queryForm.sqywbm=this.djywbm;
+      this.queryForm.sqywbm = this.djywbm;
       selectQlxx({ ...this.queryForm, ...this.pageData })
         .then((res) => {
           if (res.code === 200) {
@@ -100,7 +93,6 @@ export default {
             this.tableData.data = records;
           }
         })
-      }
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {

@@ -53,16 +53,13 @@
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex'
 import { datas, sendThis } from "../javascript/bdcqlMain.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
 export default {
-  props: {
-    bsmSqyw: { type: String, default: '' },
-    djywbm: { type: String, default: "" }
-  },
   mixins: [table, jump],
   data () {
     return {
@@ -77,21 +74,18 @@ export default {
       saveloding: false
     };
   },
-  watch: {
-    bsmSqyw (val) {
-      this.fetchData()
-    },
-  },
   mounted () {
-    sendThis(this);
+    sendThis(this)
+  },
+  computed: {
+    ...mapGetters(['bsmSqyw', 'djywbm']),
   },
   methods: {
     closeDialog () {
       this.$emit("closeDialog")
     },
     fetchData () {
-      if (this.bsmSqyw) {
-        this.queryForm.sqywbm=this.djywbm;
+      this.queryForm.sqywbm = this.djywbm;
       selectQlxx({ ...this.queryForm, ...this.pageData })
         .then((res) => {
           if (res.code === 200) {
@@ -100,7 +94,6 @@ export default {
             this.tableData.data = records;
           }
         })
-      }
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {

@@ -53,6 +53,7 @@
 </template>
 <script>
 //查封登记
+import { mapGetters } from 'vuex'
 import { datas, sendThis } from "../javascript/cfdj.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
@@ -60,7 +61,6 @@ import jump from "../components/mixin/jump";
 import { selectCfdj, startBusinessFlow } from "@/api/ywbl.js";
 export default {
   props: {
-    bsmSqyw: { type: String, default: '' },
     djywbm: { type: String, default: "" }
   },
   mixins: [table, jump],
@@ -77,21 +77,18 @@ export default {
       saveloding: false
     };
   },
-  watch: {
-    bsmSqyw (val) {
-      this.fetchData()
-    },
-  },
   mounted () {
     sendThis(this);
   },
+  computed: {
+    ...mapGetters(['bsmSqyw', 'djywbm']),
+  },
   methods: {
     closeDialog () {
       this.$emit("closeDialog")
     },
     fetchData () {
-      if (this.bsmSqyw) {
-        this.queryForm.sqywbm=this.djywbm;
+      this.queryForm.sqywbm = this.djywbm;
       selectCfdj({ ...this.queryForm, ...this.pageData })
         .then((res) => {
           if (res.code === 200) {
@@ -100,7 +97,6 @@ export default {
             this.tableData.data = records;
           }
         })
-      }
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {

@@ -55,17 +55,13 @@
 </template>
 <script>
 //抵押权首次登记
+import { mapGetters } from 'vuex'
 import { datas, sendThis } from "../javascript/diyaq.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import { selectDiyaq, startBusinessFlow } from "@/api/ywbl.js";
 export default {
-  props: {
-    bsmSqyw: { type: String, default: "" },
-    djqxObj: { type: Object, default: "" },
-    djywbm: { type: String, default: "" }
-  },
   mixins: [table, jump],
   data () {
     return {
@@ -80,21 +76,19 @@ export default {
       saveloding: false,
     };
   },
-  watch: {
-    bsmSqyw (val) {
-      this.fetchData();
-    },
-  },
   mounted () {
     sendThis(this);
   },
+  computed: {
+    ...mapGetters(['bsmSqyw', 'djqxObj', 'djywbm']),
+  },
   methods: {
     closeDialog () {
       this.$emit("closeDialog");
     },
     fetchData () {
       if (this.bsmSqyw) {
-        this.queryForm.sqywbm=this.djywbm;
+        this.queryForm.sqywbm = this.djywbm;
         selectDiyaq({ ...this.queryForm, ...this.pageData }).then((res) => {
           if (res.code === 200) {
             let { total, records } = res.result;

@@ -2,35 +2,21 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="自然幢" name="first"></el-tab-pane>
-        <el-tab-pane label="户" name="second"></el-tab-pane>
+      <el-tabs v-model="activeName" @tab-click="handleTabClick">
+        <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
+        <el-tab-pane label="户" name="h"></el-tab-pane>
       </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>
@@ -51,27 +37,22 @@
     </div>
     <div class="submit_button">
       <el-button @click="closeDialog">取消</el-button>
-      <el-button type="primary" plain @click="submitForm" :loading="saveloding">发起申请</el-button>
+      <el-button type="primary" plain @click="submitForm">发起申请</el-button>
     </div>
   </div>
 </template>
 <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 { selectScBdcdy, startBusinessFlow } from "@/api/ywbl.js";
+import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
 export default {
-  props: {
-    bsmSqyw: { type: String, default: "" },
-    djqxObj: { type: Object, default: "" },
-    djywbm: { type: String, default: "" }
-  },
   mixins: [table, jump],
   data () {
     return {
-      activeName: 'first',
+      activeName: 'zrz',
       queryForm: {
         qllx: '',
         bdcdyh: '',
@@ -84,63 +65,56 @@ export default {
         columns: datas.columns(),
         data: [],
       },
-      bdcdysz: [],
-      saveloding: false,
+      bdcdysz: []
     };
   },
-  watch: {
-    bsmSqyw (val) {
-      this.fetchData();
-    },
-  },
   mounted () {
-    sendThis(this);
+    sendThis(this)
   },
   computed: {
-    ...mapGetters(['dictData']),
+    ...mapGetters(['dictData', 'bsmSqyw', 'djqxObj', 'djywbm']),
   },
   methods: {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
-      if (this.bsmSqyw) {
+    queryClick () {
       this.queryForm.sqywbm = this.djywbm;
-        console.log(this.queryForm, this.bsmSqyw);
-        selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
+      selectFwsyq({ ...this.queryForm, ...this.pageData, fwfl: this.activeName }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
           this.tableData.total = total;
           this.tableData.data = records;
         }
-        });
-      }
+      })
+    },
+    handleTabClick () {
+      this.pageData.currentPage = 1
+      this.queryClick()
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {
         this.$message.error("请至少选择一条数据");
         return;
       }
-      this.saveloding = true;
       startBusinessFlow({
         bsmSqyw: this.bsmSqyw,
         bdcdysz: this.bdcdysz,
         djqxbm: this.djqxObj.djqxbm,
         djqxmc: this.djqxObj.djqxmc,
       }).then((res) => {
-        this.saveloding = false;
         if (res.code == 200) {
-          this.jump(res.result)
+          this.jump(res.result, this.djywbm)
         } else {
           this.$message.error(res.message);
         }
-      });
+      })
     },
     handleSelectionChange (val) {
-      this.bdcdysz = val;
+      this.bdcdysz = val
     }
-  },
-};
+  }
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";

@@ -39,17 +39,13 @@
 </template>
 <script>
 //首次登记
+import { mapGetters } from 'vuex'
 import { datas, sendThis } from "../javascript/jsydsyq100.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import { selectScBdcdy, startBusinessFlow } from "@/api/ywbl.js";
 export default {
-  props: {
-    bsmSqyw: { type: String, default: "" },
-    djqxObj: { type: Object, default: "" },
-    djywbm: { type: String, default: "" }
-  },
   mixins: [table, jump],
   data () {
     return {
@@ -73,6 +69,9 @@ export default {
   mounted () {
     sendThis(this);
   },
+  computed: {
+    ...mapGetters(['bsmSqyw', 'djqxObj', 'djywbm']),
+  },
   methods: {
     closeDialog () {
       this.$emit("closeDialog");

@@ -55,17 +55,13 @@
 </template>
 <script>
 //首次登记
+import { mapGetters } from 'vuex'
 import { datas, sendThis } from "../javascript/jsydsyq200.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
 export default {
-  props: {
-    bsmSqyw: { type: String, default: "" },
-    djqxObj: { type: Object, default: "" },
-    djywbm: { type: String, default: "" }
-  },
   mixins: [table, jump],
   data () {
     return {
@@ -88,6 +84,9 @@ export default {
   mounted () {
     sendThis(this);
   },
+  computed: {
+    ...mapGetters(['bsmSqyw', 'djqxObj', 'djywbm']),
+  },
   methods: {
     closeDialog () {
       this.$emit("closeDialog");

 export default {
   methods: {
-    jump (data) {
+    jump (data, type) {
       this.$emit("closeDialog");
       const { href } = this.$router.resolve(
         "/workFrame?bsmSlsq=" +
         data.bsmSlsq +
         "&bestepid=" +
-        data.bestepid + '&bsmBusiness='
+        data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type
       );
       window.open(href, "_blank");
     },

@@ -51,11 +51,11 @@ class data extends filter {
         label: "宗地面积",
       },
       {
-        prop: "qlsdfsmc",
+        prop: "qlsdfs",
         label: "权利设定方式",
       },
       {
-        prop: "showFwyt",
+        prop: "jzwjbyt",
         label: "房屋用途",
       },
       {

 <template>
   <dialogBox title="查询权利信息" width="85%" :isButton="false" @closeDialog="closeDialog" v-model="myValue">
-    <component :is="editItem" @closeDialog="closeDialog" :bsmSqyw="bsmSqyw" :djqxObj='djqxObj' :djywbm="djywbm" />
+    <component :is="editItem" @closeDialog="closeDialog" :key="key" />
   </dialogBox>
 </template>
 <script>
-import { queueDjywmc } from './slectBdcdata.js';
+import { mapGetters } from 'vuex'
+import { queueDjywmc } from './slectBdcdata.js'
 export default {
   props: {
-    value: { type: Boolean, default: true },
-    bsmSqyw: { type: String, default: '' },
-    djywbm: { type: String, default: '' },
-    djqxObj: { type: Object, default: '' }
+    value: { type: Boolean, default: true }
   },
   data () {
     return {
+      key: 0,
       editItem: '',
-      myValue: this.value,
-    };
+      myValue: this.value
+    }
+  },
+  computed: {
+    ...mapGetters(['djywbm'])
   },
   watch: {
     value (val) {
       this.myValue = val
+      this.key++
     },
     djywbm (val) {
-      console.log(val);
-      let dd = queueDjywmc(val);
-      this.editItem = this.loadView(dd);
-    },
+      let dd = queueDjywmc(val)
+      this.editItem = this.loadView(dd)
+    }
   },
   methods: {
     loadView (view) {
-      console.log(view);
       return r => require.ensure([], () => r(require(`./components/${view}.vue`)))
     },
     closeDialog () {
-      this.$emit("input", false);
+      this.$emit("input", false)
     }
   }
-};
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";

@@ -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":

@@ -65,7 +65,7 @@
         <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
       </div>
     </div>
-    <fqsqDialog v-model="isDialog" :bsmSqyw="bsmSqyw" :djywbm="djywbm" :djqxObj='djqxObj' />
+    <fqsqDialog v-model="isDialog" />
   </div>
 </template>
 <script>
@@ -83,14 +83,8 @@ export default {
       djlxList: [],
       ywList: [],
       djqxList: [],
-      bsmSqyw: '',
       isDialog: false,
       btnDisabled: true,
-      djywbm: '',
-      djqxObj: {
-        djqxbm: "",
-        djqxmc: "",
-      }
     }
   },
   components: {
@@ -122,17 +116,17 @@ export default {
     // 业务-登记情形选择
     handleSelectYw (item, list) {
       list.forEach(item => {
-        item.cselect = false
+        this.$set(item, 'cselect', false)
       })
-      item.cselect = !item.cselect
-      this.djqxObj = {
+      item.cselect = true
+      this.$store.dispatch('ywbl/setDjqxObj', {
         'djqxbm': item.nodecode,
         'djqxmc': item.nodename,
-      }
+      })
       if (item.sffqlc == '1') {
         this.btnDisabled = false
-        this.bsmSqyw = item.parentid
-        this.djywbm = item.djywbm
+        this.$store.dispatch('ywbl/setBsmSqyw', item.parentid)
+        this.$store.dispatch('ywbl/setDjywbm', item.djywbm)
       }
     },
     handleList (list, obj) {
@@ -147,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
+        if (type) {
           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)
           })
+        }
       })
     },
     handleCollection (item) {
@@ -171,6 +165,7 @@ export default {
               message: '收藏成功！',
               type: 'success'
             })
+            that.getDataList()
           }
         })
       } else {
@@ -181,6 +176,7 @@ export default {
               message: '取消收藏成功！',
               type: 'success'
             })
+            that.getDataList()
           }
         })
       }
@@ -200,10 +196,10 @@ export default {
       this.$set(item, 'cselect', true)
       if (item.sffqlc == '1') {
         this.btnDisabled = false
-        this.bsmSqyw = item.bsmSqyw
-        this.djywbm = item.djywbm
+        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 = []
     },