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

@@ -134,6 +134,7 @@ export default {
 .ls-title {
   padding: 16px;
   color: #ffffff;
+  font-size: 16px;
   background: linear-gradient(3deg, #409EFF, #a7cbee);
 }
 

@@ -135,6 +135,7 @@ export default {
   padding: 16px;
   color: #ffffff;
   background: linear-gradient(3deg, #409EFF, #a7cbee);
+  font-size: 16px;
 }
 
 .ls-title .svg-icon {

@@ -5,7 +5,10 @@
         <el-step title="结果查询"></el-step>
         <el-step title="结果展示"></el-step>
     </el-steps>
-    <div class="jtfccx-edit"  v-show="!isSearch">
+    <div v-if="isSearch">
+        <dydjbInfo ref="dydjbInfo"/>
+    </div>
+    <div class="jtfccx-edit" v-else>
       <div class="jtfccx-edit-con">
         <b class="title"></b>
         <el-form :model="form" label-width="120px">
@@ -31,6 +34,7 @@
             </el-col>
           </el-row>
         </el-form>
+        <b class="title">申请人</b>
         <lb-table :column="sqrColumns" key="sqr1" :data="form.sqrList" :maxHeight="200" heightNumSetting
           :pagination="false">
         </lb-table>
@@ -45,9 +49,6 @@
         </div>
       </div>
     </div>
-    <div>
-        <dydjbInfo v-show="isSearch"/>
-    </div>
   </dialogBox>
 </template>
 
@@ -68,7 +69,7 @@ export default {
     sqcxBsm: { type: String, default: "" },
   },
   mounted () {
-    
+    sendThis(this);
   },
   data () {
     return {
@@ -146,8 +147,11 @@ export default {
       getJtfcInfo({ sqcxBsm: this.sqcxBsm }).then((res) => {
         this.$endLoading();
         if (res.code == 200) {
-          this.form = res.result;
+           this.activeStep = 2;
             this.isSearch = true;
+            this.$nextTick(() => {
+              this.$refs.dydjbInfo.setResult(res.result)
+            })
         }
       });
     },
@@ -158,9 +162,11 @@ export default {
       addFwmxCxjgXx(this.form).then((res) => {
         this.$endLoading();
         if (res.code == 200) {
-          this.form = res.result;
           this.activeStep = 2;
           this.isSearch = true;
+          this.$nextTick(() => {
+            this.$refs.dydjbInfo.setResult(res.result)
+          })
           this.$parent.queryClick();
         }
       });

 <template>
-  <div>
-    <!-- 界面后期调整开发，报表开发，目前先放一张图片 -->
-    <el-form :model="ruleForm" label-width="120px">
-      <el-row>
-        <el-col :span="6">
-          <img :src="imgUrl" alt="" srcset="" />
-          <!-- <el-form-item label="查询时间：">
-            {{ ruleForm.cxsj }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="不动产单元号：">
-            {{ ruleForm.bdcdyh }}
-          </el-form-item> -->
-        </el-col>
-      </el-row>
-      <el-row>
-      </el-row>
-    </el-form>
+  <div class="jtfccx-edit">
+      <div class="jtfccx-edit-con">
+        <b class="title"></b>
+        <b class="title">房屋状况</b>
+        <lb-table :column="fwColumns" key="fwzk" :data="resultData.hdetailList" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <b class="title">土地状况</b>
+        <lb-table :column="tdColumns" key="tdzk" :data="resultData.zdjbxxDetail" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <b class="title">权属状况</b>
+        <lb-table :column="qszkColumns" key="qszk" :data="resultData.qsxxDetail" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <b class="title">抵押登记</b>
+        <lb-table :column="diyaColumns" key="dydj" :data="resultData.dyaqDetail" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <b class="title">预告登记</b>
+        <lb-table :column="ygdjColumns" key="ygdj" :data="resultData.ygdjDetail" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <b class="title">查封状况</b>
+        <lb-table :column="cfdjColumns" key="cfdj" :data="resultData.cfdjDetail" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <b class="title">异议登记</b>
+        <lb-table :column="yydjColumns" key="yydj" :data="resultData.yydjDetail" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+      </div>
     </div>
 </template>
   
 <script>
-import imgPath from "./djbyb.png"
+import { datas, sendThis } from "./infodata";
+import { getJtfcInfo } from "@/api/sqcx";
 export default {
-  props: ["formData"],
+  props: {
     
-  created () {
-    var sqcxdata = this.formData.sqcxdata;
-    this.ruleForm = sqcxdata;
   },
-
   data () {
     return {
       ruleForm: {
         cxsj: "",
         bdcdyh: "",
       },
-      imgUrl: imgPath,
+      //房屋列表字段
+      fwColumns: datas.fwCol(),
+      //土地列表字段
+      tdColumns: datas.tdCol(),
+      //权属状况列表字段
+      qszkColumns: datas.columns(),
+      //抵押登记列表字段
+      diyaColumns: datas.diyaCol(),
+      //预告登记列表字段
+      ygdjColumns: datas.ygdjCol(),
+      //查封登记列表字段
+      cfdjColumns: datas.cfdjCol(),
+      //异议登记列表字段
+      yydjColumns: datas.yydjCol(),
+      form: {},
+      resultData: {},
     };
   },
   mounted () { },
-  methods: {},
+  methods: {
+    setResult(data){
+      this.resultData = data
+    }
+  },
 };
 </script>
 <style scoped lang="scss">

+import filter from '@/utils/filter.js'
+import { Switch } from 'element-ui'
+let vm = null
+
+const sendThis = (_this) => {
+    vm = _this
+}
+class data extends filter {
+    constructor() {
+        super()
+    }
+    columns() {
+        return [
+            {
+                prop: 'qszt',
+                label: '所有人名称',
+            },
+            {
+                prop: 'bdcqzh',
+                label: '证件号码',
+            },
+            {
+                prop: 'djsj',
+                label: '取得方式',
+            },
+            {
+                prop: 'wqhth',
+                label: '房屋性质',
+            },
+            {
+                prop: 'wqsj',
+                label: '不动产权证书号',
+            },
+            {
+                prop: 'bdcdyh',
+                label: '登记时间',
+            },
+            {
+                prop: 'gyfs',
+                label: '共有方式',
+            },
+            {
+                prop: 'qlrmc',
+                label: '附记',
+            }
+        ]
+    }
+    fwCol() {
+        return [
+            {
+                prop: 'zdymc',
+                label: '幢号111',
+            },
+            {
+                prop: 'hh',
+                label: '房号',
+            },
+            {
+                prop: 'showfwjg',
+                label: '结构',
+            },
+            {
+                prop: 'dscs',
+                label: '总层数（地上）',
+            },
+            {
+                prop: 'dxcs',
+                label: '地下层数',
+            },
+            {
+                prop: 'ch',
+                label: '所在层',
+            },
+            {
+                prop: 'jzmj',
+                label: '建筑面积（㎡）',
+            },
+            {
+                prop: 'tnjzmj',
+                label: '套内面积（㎡）',
+            },
+            {
+                prop: 'showfwyt',
+                label: '规划用途',
+            }
+        ]
+    }
+    tdCol() {
+        return [
+            {
+                prop: 'qsxz',
+                label: '权属性质',
+            },
+            {
+                prop: 'mj',
+                label: '面积（㎡）',
+            },
+            {
+                prop: 'fttdmj',
+                label: '分摊土地面积（㎡）',
+            },
+            {
+                prop: 'tfyt',
+                label: '用途',
+            },
+            {
+                prop: 'syqx',
+                label: '使用期限',
+            },
+            {
+                prop: 'qdfs',
+                label: '取得方式',
+            },
+            {
+                prop: 'jttdsyqlx',
+                label: '集体土地所有权类型',
+            },
+            {
+                prop: 'jttdsyqlx',
+                label: '集体土地使用权类型',
+            }
+        ]
+    }
+    diyaCol() {
+        return [
+            {
+                prop: 'dyfs',
+                label: '抵押方式',
+                render: (h, scope) => {
+                    switch(scope.row.dyfs) {
+                        case '1':
+                            return <div>一般抵押</div>
+                        case '2':   
+                            return <div>最高额抵押</div> 
+                    }
+                }
+            },
+            {
+                prop: 'qlrmc',
+                label: '抵押权人名称',
+            },
+            {
+                prop: 'bdbzzqse',
+                label: '抵押金额（万元）',
+            },
+            {
+                prop: 'dyqx',
+                label: '抵押期限',
+            },
+            {
+                prop: 'ywh',
+                label: '不动产登记证明号',
+            },
+            {
+                prop: 'djsj',
+                label: '登记时间',
+            },
+            {
+                prop: 'fj',
+                label: '附记',
+            }
+        ]
+    }
+    ygdjCol() {
+        return [
+            {
+                prop: 'ygdjzl',
+                label: '预告登记种类',
+            },
+            {
+                prop: 'qlrmc',
+                label: '权利人名称',
+            },
+            {
+                prop: 'dyje',
+                label: '抵押金额（万元）',
+            },
+            {
+                prop: 'dyqx',
+                label: '抵押期限',
+            },
+            {
+                prop: 'ywh',
+                label: '不动产登记证明号',
+            },
+            {
+                prop: 'djsj',
+                label: '登记时间',
+            },
+            {
+                prop: 'fj',
+                label: '附记',
+            }
+        ]
+    }
+    cfdjCol() {
+        return [
+            {
+                prop: 'cfjg',
+                label: '查封机关',
+            },
+            {
+                prop: 'cfwh',
+                label: '查封文号',
+            },
+            {
+                prop: 'cffw',
+                label: '查封范围',
+            },
+            {
+                prop: 'cfsj',
+                label: '查封时间',
+            },
+            {
+                prop: 'cfqx',
+                label: '查封期限',
+            }
+        ]
+    }
+    yydjCol() {
+        return [
+            {
+                prop: 'yysqr',
+                label: '异议申请人',
+            },
+            {
+                prop: 'yysx',
+                label: '异议事项',
+            },
+            {
+                prop: 'ywh',
+                label: '不动产登记证明号',
+            },
+            {
+                prop: 'djsj',
+                label: '登记时间',
+            },
+            {
+                prop: 'fj',
+                label: '附记',
+            }
+        ]
+    }
+}
+let datas = new data()
+export {
+    datas,
+    sendThis
+}

@@ -92,9 +92,13 @@ export default {
       });
     },
     dydjbClick (scope) {
-      popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
-        sqcxdata: scope.row,
-      });
+      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);

@@ -212,10 +212,6 @@ export default {
           this.form.djSqcxDO.dycs = this.form.djSqcxDO.dycs + 1
         }
       });
-
-
-
-      //this.closeDialog();
     },
     //打开打印预览
     openPrintPrew(){

@@ -3,9 +3,7 @@
     <dialogBox title="常用意见" :fullscreen="false" width="60%" isMain v-model="value" @closeDialog="closeDialog"
       :isButton="false">
       <el-button type="primary" native-type="submit" @click="openDialog()">新增常用</el-button>
-      <lb-table :page-size="pageData.size" heightNumSetting :current-page.sync="pageData.current"
-        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
-        :column="columns" :data="tableData.data">
+      <lb-table heightNumSetting :pagination="false" :column="columns" :data="tableData.data">
       </lb-table>
       <div style="height:15px"></div>
     </dialogBox>
@@ -27,11 +25,9 @@
   </div>
 </template>
 <script>
-import table from "@/utils/mixin/table";
 import { getUserCommonOpinion, addUserCommonOpinion, delUserCommonOpinion } from "@/api/fqsq.js"
 export default {
   components: {},
-  mixins: [table],
   props: {
     value: { type: Boolean, default: false },
   },
@@ -76,13 +72,12 @@ export default {
     }
   },
   mounted () {
-    this.queryClick()
+    this.getList()
   },
   methods: {
-    queryClick () {
-      getUserCommonOpinion(this.pageData).then(res => {
-        let { total, records } = res.result
-        this.tableData.total = total;
+    getList () {
+      getUserCommonOpinion().then(res => {
+        let { records } = res.result
         this.tableData.data = records ? records : []
       })
     },
@@ -99,7 +94,6 @@ export default {
             }
           })
         } else {
-          // console.log('error submit!!');
           return false;
         }
       });
@@ -128,7 +122,7 @@ export default {
         delUserCommonOpinion({ bsmOpinion: item.bsmOpinion }).then(res => {
           if (res.code == 200) {
             this.$message.success("删除成功")
-            this.queryClick()
+            this.getList()
           } else {
             this.$message.error(res.message)
           }