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

@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/bdcdj'
 VUE_APP_BASE_API = '/bdcdj'
 
 
 # 开发环境
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'
+VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'

@@ -11,7 +11,7 @@
       </div>
       </div>
       <div class="xxTableBox">
       <div class="xxTableBox">
         <table class="xxTable">
         <table class="xxTable">
-          <tr v-for="(item, colindex) in columns.slice(0, 3)" :key="colindex">
+          <tr v-for="(item, colindex) in columns.slice(0, 2)" :key="colindex">
             <td>
             <td>
               {{ item.label }}
               {{ item.label }}
             </td>
             </td>
@@ -86,7 +86,6 @@ export default {
     loadData () {
     loadData () {
       getCfdjList({
       getCfdjList({
         bdcdyid: this.propsParam.bdcdyid,
         bdcdyid: this.propsParam.bdcdyid,
-        bsmSldy: this.propsParam.bsmSldy,
         qllx: this.propsParam.qllx,
         qllx: this.propsParam.qllx,
         qszt: this.checkList,
         qszt: this.checkList,
       }).then((res) => {
       }).then((res) => {

 <template>
 <template>
   <div>
   <div>
+    <!-- 界面后期调整开发，报表开发，目前先放一张图片 -->
     <el-form :model="ruleForm" label-width="120px">
     <el-form :model="ruleForm" label-width="120px">
       <el-row>
       <el-row>
         <el-col :span="6">
         <el-col :span="6">
-          <el-form-item label="查询时间：">
-            <!-- <el-input disabled v-model="ruleForm.cxlx"></el-input> -->
+          <img :src="imgUrl" alt="" srcset="" />
+          <!-- <el-form-item label="查询时间：">
             {{ ruleForm.cxsj }}
             {{ ruleForm.cxsj }}
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="8">
         <el-col :span="8">
           <el-form-item label="不动产单元号：">
           <el-form-item label="不动产单元号：">
             {{ ruleForm.bdcdyh }}
             {{ ruleForm.bdcdyh }}
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         </el-col>
       </el-row>
       </el-row>
       <el-row>
       <el-row>
-        <el-col :span="24">
-          <table class="table1">
-            <tr>
-              <td>1</td>
-              <td>2</td>
-              <td>3</td>
-              <td>4</td>
-              <td>5</td>
-              <td>6</td>
-              <td>7</td>
-              <td>8</td>
-              <td>9</td>
-              <td>10</td>
-              <td>11</td>
-
-            </tr>
-          </table>
-        </el-col>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
   </div>
   </div>
@@ -40,6 +23,7 @@
   
   
   <script>
   <script>
 import { getJtfcInfo } from "@/api/sqcxjl";
 import { getJtfcInfo } from "@/api/sqcxjl";
+import imgPath from "./打印登记薄.png"  //先导入
 
 
 export default {
 export default {
   components: {},
   components: {},
@@ -56,6 +40,7 @@ export default {
         cxsj: "",
         cxsj: "",
         bdcdyh: "",
         bdcdyh: "",
       },
       },
+      imgUrl:imgPath,
     };
     };
   },
   },
 
 

@@ -98,10 +98,10 @@ export default {
       // var sqcxBsm = scope.row.bsmSqcx; 
       // var sqcxBsm = scope.row.bsmSqcx; 
       this.$popup({
       this.$popup({
         title: "打印登记薄",
         title: "打印登记薄",
-        width: "85%",
+        width: "65%",
         btnShow: true,
         btnShow: true,
         editItem: "sqcx/dydjb/components/dydjbInfo", // 弹窗内容
         editItem: "sqcx/dydjb/components/dydjbInfo", // 弹窗内容
-        height: "700px",
+        height: "800px",
         formData: {
         formData: {
           sqcxdata: scope.row,
           sqcxdata: scope.row,
         },
         },

@@ -30,7 +30,7 @@
           <el-button  @click="resetClick()">重置</el-button>
           <el-button  @click="resetClick()">重置</el-button>
         </div>
         </div>
         <b class="title">查询结果</b>
         <b class="title">查询结果</b>
-        <p>查询编号：202200409</p>
+        <!-- <p>查询编号：{{cxbh}}</p> -->
         <lb-table :column="searchData.columns" border :data="searchData.data" :maxHeight="200" heightNumSetting
         <lb-table :column="searchData.columns" border :data="searchData.data" :maxHeight="200" heightNumSetting
           :pagination="false">
           :pagination="false">
         </lb-table>
         </lb-table>

@@ -23,7 +23,7 @@ class data extends filter {
         label: '登记时间',
         label: '登记时间',
       },
       },
       {
       {
-        prop: 'hth',
+        prop: 'wqhth',
         label: '合同号',
         label: '合同号',
       },
       },
       {
       {
@@ -39,11 +39,11 @@ class data extends filter {
         label: '共有方式',
         label: '共有方式',
       },
       },
       {
       {
-        prop: 'qlr',
+        prop: 'qlrmc',
         label: '权利人',
         label: '权利人',
       },
       },
       {
       {
-        prop: 'zjh',
+        prop: 'zjhm',
         label: '证件号',
         label: '证件号',
       },
       },
       {
       {
@@ -51,7 +51,7 @@ class data extends filter {
         label: '房地坐落',
         label: '房地坐落',
       },
       },
       {
       {
-        prop: 'jzmj',
+        prop: 'fwmj',
         label: '建筑面积（㎡）',
         label: '建筑面积（㎡）',
       },
       },
       {
       {

@@ -73,7 +73,7 @@
       </el-row>
       </el-row>
       <el-row>
       <el-row>
         <el-col>
         <el-col>
-          <p>查询编号：202200409</p>
+          <p>查询编号：{{cxbh}}</p>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
       <el-row>
       <el-row>
@@ -145,6 +145,7 @@ export default {
           this.sqrData.data = res.result.sqxx;
           this.sqrData.data = res.result.sqxx;
           this.qlrData.data = res.result.qlrxx;
           this.qlrData.data = res.result.qlrxx;
           this.cxjgData.data = res.result.djSqcxCxjgDOList;
           this.cxjgData.data = res.result.djSqcxCxjgDOList;
+          this.cxbh=res.result.djSqcxDO.cxbh;
 
 
         }
         }
       })
       })

@@ -8,11 +8,23 @@ class data extends filter {
   constructor() {
   constructor() {
     super()
     super()
   }
   }
-  cxjgcolumns () {
+  cxjgcolumns() {
     return [
     return [
       {
       {
         prop: 'qszt',
         prop: 'qszt',
         label: '权属状态',
         label: '权属状态',
+        render: (h, scope) => {
+          switch (scope.row.qszt) {
+            case '0':
+              return <div>临时</div>
+            case '1':
+              return <div>现势</div>
+            case '2':
+              return <div>历史</div>
+            case '3':
+              return <div>终止</div>
+          }
+        }
       },
       },
       {
       {
         prop: 'bdcqzh',
         prop: 'bdcqzh',
@@ -23,7 +35,7 @@ class data extends filter {
         label: '登记时间',
         label: '登记时间',
       },
       },
       {
       {
-        prop: 'hth',
+        prop: 'wqhth',
         label: '合同号',
         label: '合同号',
       },
       },
       {
       {
@@ -39,19 +51,19 @@ class data extends filter {
         label: '共有方式',
         label: '共有方式',
       },
       },
       {
       {
-        prop: 'qlr',
+        prop: 'qlrmc',
         label: '权利人',
         label: '权利人',
       },
       },
       {
       {
-        prop: 'zjh',
+        prop: 'zjhm',
         label: '证件号',
         label: '证件号',
       },
       },
       {
       {
-        prop: 'fdzl',
+        prop: 'zl',
         label: '房地坐落',
         label: '房地坐落',
       },
       },
       {
       {
-        prop: 'jzmj',
+        prop: 'fwmj',
         label: '建筑面积（㎡）',
         label: '建筑面积（㎡）',
       },
       },
       {
       {
@@ -74,7 +86,7 @@ class data extends filter {
       }
       }
     ]
     ]
   }
   }
-  sqrcolumns () {
+  sqrcolumns() {
     return [
     return [
       {
       {
         prop: 'sqrxm',
         prop: 'sqrxm',
@@ -95,7 +107,7 @@ class data extends filter {
     ]
     ]
   }
   }
 
 
-  qlrcolumns () {
+  qlrcolumns() {
     return [
     return [
       {
       {
         prop: 'sqrxm',
         prop: 'sqrxm',