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

@@ -112,10 +112,6 @@ export default {
   border-radius: 10px;
 }
 
-.ls-head {
-  position: relative;
-}
-
 .ls-mask-window b {
   padding-left: 5px;
 }
@@ -133,20 +129,16 @@ export default {
 
 .ls-mask-content {
   padding: 20px;
-  text-align: center;
-  position: absolute;
   width: 100%;
   overflow: scroll;
+  max-height: 500px;
 }
 
 .ls-mask-footer {
   height: 65px;
   display: flex;
   justify-content: center;
-  position: absolute;
   width: 100%;
-  bottom: 0px;
-  right: 0px;
   box-shadow: 0px 0px 2px 0px;
   border-radius: 0 0 10px 10px;
 }

@@ -9,6 +9,7 @@
           height:"", //弹窗的高度
           editItem: 'ywbl/dbx/aa', // 子组件的路径  相当于你平时img取的路径
           formData:this.formData, //父组件传给子组件的参数  
+          btnShow:false,//按钮显隐 false隐藏 true显示
           confirmText:"" // 确认按钮的文字
           cancelText:"" //取消按钮的文字
           cancel: function () {}, //取消事件的回调

@@ -7,35 +7,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>
@@ -56,7 +42,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 "@/views/ywbl/ywsq/components/mixin/jump";
 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
@@ -93,7 +79,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) {
@@ -105,7 +91,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":