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

 import request from '@/utils/request'
 import SERVER from './config'
-// 获取家庭房产列表
-export function getJtfcPage (data) {
+// 获取申请查询列表
+export function getSqcxPage (data) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcPage',
-    method: 'post',
-    data
-  })
-}
-
-// 获取房屋明细列表
-export function getFwmxPage (data) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxPage',
+    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getSqcxPage',
     method: 'post',
     data
   })
@@ -45,6 +36,15 @@ export function getJtfcInfo (params) {
   })
 }
 
+// 获取房屋明细记录详细信息
+export function getFwmxInfo (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxInfo/',
+    method: 'get',
+    params
+  })
+}
+
 // 打印家庭房产
 export function printJtcfInfo (data) {
   return request({

+
+/deep/.modifycollapse{
+
+ .el-collapse-item__header{
+    margin-bottom: 10px;
+    background: #F3F4F7;
+   border: 1px solid #D9D9D9;
+   border-radius: 4px;
+   font-size: 16px;
+   font-family: PingFangSC-Medium, PingFang SC;
+   font-weight: 500;
+   color: #333333;
+   line-height: 18px;
+
+  }
+  .el-collapse-item__header::before{
+    content: "";
+    margin-left: 10px;
+    margin-right: 10px;
+    width: 4px;
+    height: 18px;
+    background: #2B7FF1;
+  }
+  .el-collapse-item__arrow{
+    color: #979797 ;
+    margin-left: 10px;
+  }
+
+
+}
+

@@ -23,7 +23,7 @@
   }
 
   .el-dialog__body {
-    max-height: 88vh;
+    max-height: 90vh;
     overflow-x: hidden;
     overflow-y: hidden;
   }

@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import { addFwmxCxjgXx, getJtfcInfo,printJtcfInfo } from "@/api/sqcx";
+import { addFwmxCxjgXx, getFwmxInfo,printJtcfInfo } from "@/api/sqcx";
 import { getPrintTemplateByCode } from "@/api/system";
 import { datas, sendThis } from "./dydjbdata";
 import { getLodop } from "@/utils/LodopFuncs"
@@ -144,7 +144,7 @@ export default {
     //加载详细信息
     loadData () {
       this.$startLoading();
-      getJtfcInfo({ sqcxBsm: this.sqcxBsm }).then((res) => {
+      getFwmxInfo({ sqcxBsm: this.sqcxBsm }).then((res) => {
         this.$endLoading();
         if (res.code == 200) {
            this.activeStep = 2;

@@ -36,10 +36,13 @@
   
 <script>
 import { datas, sendThis } from "./infodata";
-import { getJtfcInfo } from "@/api/sqcx";
+import { getFwmxInfo } from "@/api/sqcx";
 export default {
   props: {
-    
+    formData: {
+      type: Object,
+      default: () => {},
+    },
   },
   data () {
     return {
@@ -65,10 +68,24 @@ export default {
       resultData: {},
     };
   },
-  mounted () { },
+  mounted () {
+    if(this.formData){
+      this.getDetailInfo()
+    }
+  },
   methods: {
     setResult(data){
       this.resultData = data
+    },
+    getDetailInfo(){
+      this.$startLoading();
+      getFwmxInfo({ sqcxBsm: this.formData.bsmSqcx }).then((res) => {
+        this.$endLoading();
+        if (res.code == 200) {
+            this.resultData = res.result
+        }
+      });
+      
     }
   },
 };

@@ -51,7 +51,7 @@ import table from "@/utils/mixin/table";
 import { popupDialog } from "@/utils/popup.js";
 import { datas, sendThis } from "./dydjbdata";
 import addDydjb from "./components/addDydjb.vue";
-import { getFwmxPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/sqcx";
 export default {
   name: "dydjb",
   components: { addDydjb },
@@ -71,6 +71,7 @@ export default {
         cxbh: "",
         sqr: "",
         ywh: "",
+        cxlx: '2'
       },
       tableData: {
         columns: datas.columns(),
@@ -82,7 +83,7 @@ export default {
     // 初始化数据
     queryClick () {
       this.$startLoading();
-      getFwmxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+      getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
         if (res.code === 200) {
           let { records, total } = res.result;
@@ -92,19 +93,20 @@ export default {
       });
     },
     dydjbClick (scope) {
-      this.$nextTick(() => {
-        this.isDialog = true
-        this.sqcxBsm = scope.row.bsmSqcx
-      })
-      // popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
-      //   bsmSqcx: scope.row.bsmSqcx,
-      // });
+      // this.$nextTick(() => {
+      //   this.isDialog = true
+      //   this.sqcxBsm = scope.row.bsmSqcx
+      // })
+      popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
+        bsmSqcx: scope.row.bsmSqcx,
+      });
     },
     handleSort (name, sort) {
       console.log(name, sort);
     },
     openAddDialog(){
       this.isDialog = true
+      this.sqcxBsm = ''
     }
   },
 };

@@ -63,7 +63,7 @@ class data extends filter {
         label: "操作",
         width: 100,
         render: (h, scope) => {
-          return <el-button type="text" icon='el-icon-printer' onClick={() => { vm.dydjbClick(scope) }}>打印登记薄</el-button>
+          return <el-button type="text" icon='el-icon-view' onClick={() => { vm.dydjbClick(scope) }}>查看</el-button>
         }
       },
 

@@ -46,7 +46,7 @@
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./jtfcdata";
-import { getJtfcPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/sqcx";
 import addjtfc from "./components/addjtfc.vue";
 export default {
   name: "jtfc",
@@ -64,6 +64,7 @@ export default {
       queryForm: {
         cxbh: "",
         sqr: "",
+        cxlx: '1'
       },
       tableData: {
         columns: datas.columns(),
@@ -75,7 +76,7 @@ export default {
     // 初始化数据
     queryClick () {
       this.$startLoading();
-      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+      getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
         if (res.code === 200) {
           let { records, total } = res.result;

@@ -69,7 +69,7 @@
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./sqcxjldata";
-import { getJtfcPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/sqcx";
 export default {
   name: "sqcxjl",
   mixins: [table],
@@ -94,7 +94,7 @@ export default {
     // 初始化数据
     queryClick () {
       this.$startLoading();
-      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+      getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
         if (res.code === 200) {
           let { records, total } = res.result;

@@ -136,7 +136,7 @@
         </el-row>
       </el-form>
       <el-collapse accordion>
-        <el-collapse-item title="登记情形设置" name="1">
+        <el-collapse-item class="modifycollapse" title="登记情形设置" name="1">
           <lb-table
             :column="djqxCol"
             border
@@ -146,7 +146,7 @@
           >
           </lb-table>
         </el-collapse-item>
-        <el-collapse-item title="材料信息设置" name="2">
+        <el-collapse-item class="modifycollapse" title="材料信息设置" name="2">
           <lb-table
             :column="clxxCol"
             border
@@ -157,6 +157,7 @@
           </lb-table>
         </el-collapse-item>
         <el-collapse-item
+        class="modifycollapse"
           title="刷选权利设置"
           name="3"
           v-if="form.ywDetail.sfsxql == '1'"
@@ -179,7 +180,7 @@
             </li>
           </ul>
         </el-collapse-item>
-        <el-collapse-item title="办理状态设置" name="4">
+        <el-collapse-item class="modifycollapse" title="办理状态设置" name="4">
           <ul class="screen-list">
             <li v-for="(item, index) in form.sxzt" :key="index">
               <div class="screen-list-left">
@@ -332,6 +333,7 @@ export default {
 <style lang='scss' scoped>
 @import "~@/styles/mixin.scss";
 @import "~@/styles/dialogBox.scss";
+@import "~@/styles/collapse.scss";
 
 .contentBox {
   height: 75vh;

@@ -77,8 +77,7 @@ export default {
   methods: {
     getList () {
       getUserCommonOpinion().then(res => {
-        let { records } = res.result
-        this.tableData.data = records ? records : []
+        this.tableData.data = res.result
       })
     },
     //新增常用意见

 export default {
-  data () {
+  data() {
     return {
       isSearch: false,
       searchList: [],
@@ -7,18 +7,44 @@ export default {
     }
   },
   methods: {
-    moreQueryClick () {
+    // 点击高级查询弹出查询弹框
+
+    moreQueryClick() {
       this.isSearch = true
+
     },
-    handleSelect (bs, mc, code) {
-      let that = this
+    // 查询事件
+    handleSelect(bs, mc, code) {
       this.dictData[bs].forEach(item => {
         if (item.dcode == this.queryForm[code]) {
           this.searchForm[mc] = item.dname
         }
       })
     },
-    handelItem (item, index) {
+    // 清空单个表单
+    handleEmpty(el) {
+      for (var i = 0; i < this.searchList.length; i++) {
+        if (el == this.searchList[i].zdm) {
+          this.searchList.splice(i, 1)
+        }
+      }
+      let obj = {
+        ywlymc: 'ywly',
+        qllxmc: 'qllx',
+        djlxmc: 'djlx'
+      }
+      if (obj[el]) {
+        this.queryForm[obj[el]] = ''
+      } else if (this.otherForm[[el]]) {
+        this.otherForm[[el]] = ''
+      } else {
+        this.queryForm[el] = ''
+      }
+      this.searchForm[el] = ''
+    },
+    // 删除单个查询条件
+
+    handelItem(item, index) {
       let obj = {
         ywlymc: 'ywly',
         qllxmc: 'qllx',
@@ -33,10 +59,8 @@ export default {
         this.queryForm[item.zdm] = ''
       }
       this.searchForm[item.zdm] = ''
-      this.iterationData()
-      this.queryClick()
     },
-    iterationData () {
+    iterationData() {
       let obj = {
         ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称',
         qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间'
@@ -46,12 +70,13 @@ export default {
         if (value) return { name: obj[name], value, zdm: name }
       }).filter(Boolean)
     },
-    getSearch (val) {
+    getSearch(val) {
       this.otherForm = val
       this.iterationData()
       this.queryClick()
     },
-    hanldeCleanAll () {
+    // 清空查询条件
+    hanldeCleanAll() {
       this.searchForm = {}
       this.queryForm = {
         ywly: "",
@@ -59,6 +84,7 @@ export default {
         djlx: "",
         ywh: ""
       }
+      this.otherForm = {}
       this.searchList = []
       this.queryClick()
     }

@@ -9,17 +9,17 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="申请业务名称" prop="sqywmc">
-            <el-input v-model="ruleForm.sqywmc"></el-input>
+            <el-input v-model="ruleForm.sqywmc"  placeholder="请输入申请业务名称"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="权利人" prop="qlrmc">
-            <el-input v-model="ruleForm.qlrmc"></el-input>
+            <el-input v-model="ruleForm.qlrmc" placeholder="请输入权利人"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="义务人" prop="ywrmc">
-            <el-input v-model="ruleForm.ywrmc"></el-input>
+            <el-input v-model="ruleForm.ywrmc" placeholder="请输入义务人"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -45,6 +45,7 @@
 export default {
   props: {
     value: { type: Boolean, default: false },
+    advancedForm:{type: Object, default: "" }
   },
   data () {
     return {
@@ -60,19 +61,31 @@ export default {
   watch: {
     value (val) {
       this.myValue = val
+    },
+    advancedForm(){
+      this.ruleForm={...this.advancedForm}
     }
   },
+
+
   methods: {
     closeDialog () {
       this.$emit('input', false)
     },
     resetForm () {
       this.$refs['ruleForm'].resetFields()
+      this.ruleForm={
+        sqywmc: '',
+        qlrmc: '',
+        ywrmc: '',
+        slsj: ''
+      }
     },
     submitForm () {
       this.$emit('getSearch', _.cloneDeep(this.ruleForm))
       this.$emit('input', false)
       this.$refs['ruleForm'].resetFields()
+
     }
   }
 }

@@ -15,6 +15,7 @@
                 class="width100"
                 filterable
                 @change="handleSelect('ywly', 'ywlymc', 'ywly')"
+                @clear="handleEmpty('ywlymc')"
                 clearable
                 placeholder="请选择业务来源"
               >
@@ -34,6 +35,7 @@
                 v-model="queryForm.qllx"
                 class="width100"
                 @change="handleSelect('A8', 'qllxmc', 'qllx')"
+                @clear="handleEmpty('qllxmc')"
                 filterable
                 clearable
                 placeholder="请选择权利类型"
@@ -54,6 +56,7 @@
                 v-model="queryForm.djlx"
                 class="width100"
                 @change="handleSelect('A21', 'djlxmc', 'djlx')"
+                @clear="handleEmpty('djlxmc')"
                 filterable
                 clearable
                 placeholder="请选择登记类型"
@@ -126,7 +129,11 @@
       >
       </lb-table>
     </div>
-    <searchBox v-model="isSearch" @getSearch="getSearch" />
+    <searchBox
+      v-model="isSearch"
+      @getSearch="getSearch"
+      :advancedForm="otherForm"
+    />
   </div>
 </template>
 <script>
@@ -172,6 +179,7 @@ export default {
       this.queryClick();
     };
   },
+
   watch: {
     queryForm: {
       handler(newName, oldName) {},
@@ -205,7 +213,6 @@ export default {
         }
       });
     },
-
     handleSort(val) {
       this.queryForm.sortField = val.prop;
       this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";

@@ -2,45 +2,94 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px">
+      <el-form
+        :model="queryForm"
+        ref="queryForm"
+        @submit.native.prevent
+        label-width="80px"
+      >
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务来源" label-width="70px">
-              <el-select v-model="queryForm.ywly" @change="handleSelect('ywly', 'ywlymc', 'ywly')" class="width100"
-                filterable clearable placeholder="请选择业务来源">
-                <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+              <el-select
+                v-model="queryForm.ywly"
+                @change="handleSelect('ywly', 'ywlymc', 'ywly')"
+                @clear="handleEmpty('ywlymc')"
+                class="width100"
+                filterable
+                clearable
+                placeholder="请选择业务来源"
+              >
+                <el-option
+                  v-for="item in dictData['ywly']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" @change="handleSelect('A8', 'qllxmc', 'qllx')" class="width100"
-                filterable clearable placeholder="请选择权利类型">
-                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+              <el-select
+                v-model="queryForm.qllx"
+                @change="handleSelect('A8', 'qllxmc', 'qllx')"
+                @clear="handleEmpty('qllxmc')"
+                class="width100"
+                filterable
+                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-form-item label="登记类型">
-              <el-select v-model="queryForm.djlx" @change="handleSelect('A21', 'djlxmc', 'djlx')" class="width100"
-                filterable clearable placeholder="请选择登记类型">
-                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+              <el-select
+                v-model="queryForm.djlx"
+                @change="handleSelect('A21', 'djlxmc', 'djlx')"
+                @clear="handleEmpty('djlxmc')"
+                class="width100"
+                filterable
+                clearable
+                placeholder="请选择登记类型"
+              >
+                <el-option
+                  v-for="item in dictData['A21']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" @clear="queryClick" clearable class="width200px">
+              <el-input
+                placeholder="请输入业务号"
+                v-model="queryForm.ywh"
+                @clear="queryClick"
+                clearable
+                class="width200px"
+              >
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
+              <el-button type="primary" native-type="submit" @click="queryClick"
+                >查询</el-button
+              >
               <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
@@ -50,43 +99,62 @@
           <ul>
             <li v-for="(item, index) in searchList" :key="index">
               {{ item.name }}:{{ item.value }}
-              <i class="el-icon-circle-close" @click="handelItem(item, index)"></i>
+              <i
+                class="el-icon-circle-close"
+                @click="handelItem(item, index)"
+              ></i>
             </li>
           </ul>
-          <el-button class="clean-btn" type="text" v-if="searchList.length > 0" @click.native="hanldeCleanAll">清除全部
+          <el-button
+            class="clean-btn"
+            type="text"
+            v-if="searchList.length > 0"
+            @click.native="hanldeCleanAll"
+            >清除全部
           </el-button>
         </el-row>
       </el-form>
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
-        :current-page.sync="pageData.currentPage" :heightNum="295" :total="tableData.total"
-        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
-        :data="tableData.data">
+      <lb-table
+        :page-size="pageData.size"
+        class="loadingtext"
+        @sort-change="handleSort"
+        :current-page.sync="pageData.currentPage"
+        :heightNum="295"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
       </lb-table>
     </div>
-    <searchBox v-model="isSearch" @getSearch="getSearch" />
+    <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex'
-import searchMin from "../components/mixin/index"
-import table from "@/utils/mixin/table"
-import { datas, sendThis } from "./ybxdata"
-import { searchTaskDone } from "@/api/ywbl"
-import searchBox from '../components/search.vue'
+import { mapGetters } from "vuex";
+import searchMin from "../components/mixin/index";
+import table from "@/utils/mixin/table";
+import { datas, sendThis } from "./ybxdata";
+import { searchTaskDone } from "@/api/ywbl";
+import searchBox from "../components/search.vue";
 export default {
   name: "ybx",
   components: { searchBox },
   mixins: [table, searchMin],
-  mounted () {
+  mounted() {
+       window["getBpageList"] = () => {
+      this.queryClick();
+    };
     sendThis(this);
   },
   computed: {
-    ...mapGetters(['dictData'])
+    ...mapGetters(["dictData"]),
   },
-  data () {
+  data() {
     return {
       queryForm: {
         ywly: "",
@@ -95,10 +163,10 @@ export default {
         ywh: "",
       },
       searchForm: {
-        ywlymc: '',
-        qllxmc: '',
-        djlxmc: '',
-        ywh: ''
+        ywlymc: "",
+        qllxmc: "",
+        djlxmc: "",
+        ywh: "",
       },
       tableData: {
         total: 0,
@@ -109,35 +177,46 @@ export default {
   },
   methods: {
     // 列表渲染接口
-    queryClick () {
-      this.$startLoading()
-      this.searchForm.ywh = this.queryForm.ywh
-      this.iterationData()
-      searchTaskDone({ ...this.queryForm,...this.otherForm, ...this.pageData }).then(res => {
-        this.$endLoading()
+    queryClick() {
+      this.$startLoading();
+      this.searchForm.ywh = this.queryForm.ywh;
+      this.iterationData();
+      searchTaskDone({
+        ...this.queryForm,
+        ...this.otherForm,
+        ...this.pageData,
+      }).then((res) => {
+        this.$endLoading();
         if (res.code === 200) {
-          let { total, records } = res.result
-          records.forEach(item => {
-            item.qlrmc = item.qlrmc.join(',')
-            item.ywh = item.ywh.join(',')
-            item.zl = item.zl.join(',')
-            item.outstepdate = item.outstepdate[0]
-          })
-          this.tableData.total = total ? total : 0
-          this.tableData.data = records ? records : []
+          let { total, records } = res.result;
+          records.forEach((item) => {
+            item.qlrmc = item.qlrmc.join(",");
+            item.ywh = item.ywh.join(",");
+            item.zl = item.zl.join(",");
+            item.outstepdate = item.outstepdate[0];
+          });
+          this.tableData.total = total ? total : 0;
+          this.tableData.data = records ? records : [];
         }
-      })
+      });
+    },
+    handleSort(val) {
+      this.queryForm.sortField = val.prop;
+      this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
+      this.queryClick();
+    },
+    ywhClick(item) {
+      const { href } = this.$router.resolve(
+        "/workFrameView?bsmSlsq=" +
+          item.bsmSlsq +
+          "&bestepid=" +
+          item.bestepid +
+          "&bsmBusiness=" +
+          "&viewtype=1"
+      );
+     window.open(href, `urlname${item.bsmSlsq}`);
     },
-    handleSort (val) {
-      this.queryForm.sortField = val.prop
-      this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc'
-      this.queryClick()
   },
-    ywhClick (item) {
-      const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1');
-      window.open(href, '_blank');
-    }
-  }
 };
 </script>
 <style scoped lang="scss">

@@ -4,33 +4,53 @@
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" label-width="120px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="10">
             <el-form-item label="不动产单元号">
-              <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width300px">
+              <el-input
+                placeholder="请输入不动产单元号"
+                v-model="queryForm.bdcdyh"
+                clearable
+                class="width300px"
+              >
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="10">
             <el-form-item label="不动产权证号">
-              <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width300px">
+              <el-input
+                placeholder="请输入不动产权证号"
+                v-model="queryForm.bdcqzh"
+                clearable
+                class="width300px"
+              >
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+        </el-row>
+        <el-row>
+          <el-col :span="10">
             <el-form-item label="权利人">
-              <el-input placeholder="请输入不动产单元号" v-model="queryForm.zl" clearable class="width300px">
+              <el-input
+                placeholder="请输入权利人"
+                v-model="queryForm.zl"
+                clearable
+                class="width300px"
+              >
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
+          <el-col :span="10">
             <el-form-item label="坐落">
-              <el-input placeholder="请输入不动产单元号" v-model="queryForm.zl" clearable class="width300px">
+              <el-input
+                placeholder="请输入坐落"
+                v-model="queryForm.zl"
+                clearable
+                class="width300px"
+              >
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="2" class="btnColRight">
+          <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
@@ -40,10 +60,19 @@
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
-      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :heightNum="400"
-        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
-        :data="tableData.data">
+      <lb-table
+        ref="table"
+        @row-click="handleRowClick"
+        :page-size="pageData.pageSize"
+        :heightNum="400"
+        :current-page.sync="pageData.currentPage"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        @selection-change="handleSelectionChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
       </lb-table>
     </div>
     <div class="submit_button">
@@ -63,9 +92,9 @@ export default {
   mixins: [table, jump],
   props: {
     isJump: { type: Boolean, default: false },
-    sqywInfo: { type: Object, default: () => { } },
+    sqywInfo: { type: Object, default: () => {} },
   },
-  data () {
+  data() {
     return {
       queryForm: defaultParameters.defaultParameters(),
       tableData: {
@@ -76,11 +105,11 @@ export default {
       bdcdysz: [],
     };
   },
-  mounted () {
+  mounted() {
     sendThis(this);
   },
   methods: {
-    queryClick () {
+    queryClick() {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {
@@ -90,7 +119,7 @@ export default {
         }
       });
     },
-    submitForm () {
+    submitForm() {
       if (this.bdcdysz.length == 0) {
         this.$message.error("请至少选择一条数据");
         return;
@@ -117,14 +146,14 @@ export default {
         }
       });
     },
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       val.forEach((item, index) => {
         item.bsmSsql = item.bsmQlxx;
         item.ybdcqzsh = item.bdcqzh;
       });
       this.bdcdysz = val;
     },
-    openBook (row) {
+    openBook(row) {
       var param = {
         bdcdyid: row.bdcdyid,
         qllx: row.qllx,

@@ -70,11 +70,11 @@ class data extends filter {
         label: "建筑物名称",
       },
       {
-        label: "权利性质",
+        label: "土地/房屋性质",
         render: (h, scope) => {
           return (
             <div>
-              {(scope.row.showQlxz) + (' / ') + (scope.row.fwxzbsm)}
+              {(scope.row.showQlxz) + (' / ') + (scope.row.fwxzmc)}
             </div>
           )
         }
@@ -90,7 +90,7 @@ class data extends filter {
         }
       },
       {
-        label: "用途",
+        label: "土地/房屋用途",
         render: (h, scope) => {
           return (
             <div>

@@ -121,7 +121,8 @@ export default {
     },
     openDialog (item) {
       const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
-      window.open(href, '_blank');
+      // window.open(href, '_blank');
+      window.open(href, `urlname${item.bsmSlsq}`);
     }
   }
 }