1111

@@ -2,33 +2,59 @@ import request from '@/utils/request'
 import SERVER from './config'
 
 /* 
-业务办理-选择单元-根据条件进行列表查询-国有建设用地使用权、房屋所有权（首次登记）
+业务办理-选择单元-查询宗地基本信息
 */
-export function selectScBdcdy(data) {
+export function selectZdjbxx(data) {
     return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectScBdcdy',
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
         method: 'post',
         data,
         showLoading: true
     })
 }
 
-export function selectZdjbxx(data) {
+
+/* 
+业务办理-选择单元-查询建设用地、宅基地信息
+*/
+export function selectJsydQlxx(data) {
     return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectJsydQlxx',
         method: 'post',
         data,
         showLoading: true
     })
 }
 
+/* 
+业务办理-选择单元-查询自然幢信息
+*/
+export function selectZrz(data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
+        method: 'post',
+        data,
+        showLoading: true
+    })
+}
 
 /* 
-选择建设用地用地查询方法
+业务办理-选择单元-查询户信息
 */
-export function selectJsydQlxx(data) {
+export function selectH(data) {
     return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectJsydQlxx',
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
+        method: 'post',
+        data,
+        showLoading: true
+    })
+}
+
+
+// 获取自然幢下其他户
+export function selectOtherH (data) {
+    return request({
+        url: 'ywbl/ywsq/selectOtherH',
         method: 'post',
         data,
         showLoading: true

@@ -46,6 +46,7 @@ import { datas, sendThis } from "../javascript/fwsyq.js";
 import table from "@/utils/mixin/table";
 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
 import { selectScBdcdy, startBusinessFlow, choiceBdcdy,selectOtherH } from "@/api/ywbl.js";
+import { selectZrz, selectH } from "@/api/selectQlxx.js";
 export default {
   mixins: [table, jump],
   props: {
@@ -82,13 +83,22 @@ export default {
         //从业务办理进入
         this.queryForm.sqywbm = this.djywbm;
         this.queryForm.fwfl = this.activeName;
-        selectScBdcdy({ ...this.queryForm, ...this.pageData  }).then((res) => {
-          if (res.code === 200) {
-            let { total, records } = res.result;
-            this.tableData.total = total;
-            this.tableData.data = records;
-          }
-        })
+        if(this.activeName=="zrz"){
+          selectZrz({ ...this.queryForm, ...this.pageData  }).then((res) => {
+                    if (res.code === 200) {
+                      this.tableData.total = res.result.total;
+                      this.tableData.data = res.result.records;
+                    }
+                  });
+        }else{
+          selectH({ ...this.queryForm, ...this.pageData  }).then((res) => {
+                    if (res.code === 200) {
+                      this.tableData.total = res.result.total;
+                      this.tableData.data = res.result.records;
+                    }
+                  })
+        }
+       
       }else{
         //从办理框架选择不动产单元进入
         //房屋首次办理选择不动产需找出对应自然幢下未选择的户
@@ -103,8 +113,9 @@ export default {
       }
     },
     handleTabClick () {
+      
       this.pageData.currentPage = 1;
-      this.fetchData()
+      this.fetchData();
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {

@@ -26,10 +26,31 @@ class data extends filter {
           )
         }
       },
-      // {
-      //   prop: "status",
-      //   label: "状态",
-      // },
+      {
+        label: "状态",
+        render: (h, scope) => {
+          return (
+            <div>              
+              {/* <a v-on:click="doSomething"></a> */}
+              <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
+              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
+              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
+              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
+              <span v-show={scope.row.cfzt == 1}>,已查封</span>
+              <span v-show={scope.row.diyizt == 1}>,已地役</span>
+              <span v-show={scope.row.yyzt == 1}>,异议中</span>
+              <span v-show={scope.row.xzzt == 1}>,已限制</span>
+              <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
+              <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
+              <span v-show={scope.row.dyzt == 1}>,已抵押</span>
+            </div>
+          )
+        }
+      },
+      {
+        prop: "bdcqzsh",
+        label: "土地证号",
+      },     
       {
         prop: "qllxmc",
         label: "权利类型",
@@ -37,18 +58,26 @@ class data extends filter {
       {
         prop: "zrzh",
         label: "自然幢号",
+      },      
+      {       
+        label: "土地性质/房屋性质",
+        render: (h, scope) => {
+          return (
+            <div>              
+              {(scope.row.tdxzmc)+(' / ')+(scope.row.tdxzmc)}
+            </div>
+          )
+        }      
       },
-      {
-        prop: "bdcdyh",
-        label: "不动产单元号",
-      },
-      {
-        prop: "showQlxz",
-        label: "权利性质",
-      },
-      {
-        prop: "zdmj",
-        label: "宗地面积",
+      {      
+        label: "土地面积/房屋面积",
+        render: (h, scope) => {
+          return (
+            <div>              
+              {(scope.row.zdmj)+(' / ')+(scope.row.scjzmj)}
+            </div>
+          )
+        }      
       },
       // {
       //   prop: "qlsdfs",
@@ -56,11 +85,11 @@ class data extends filter {
       // },
       {
         prop: "jzwjbyt",
-        label: "房屋用途",
+        label: "土地用途/房屋用途",
       },
       {
         prop: "zl",
-        label: "坐落",
+        label: "自然幢坐落",
       },
     ]
   }

@@ -7,7 +7,7 @@
         <el-collapse-item title="业务申请" name="1">
           <ul class="item-list">
             <li v-for="(obj, key) in list" :key="key" @click="handleList(list, obj)" :class="obj.check ? 'active' : ''">
-              {{ obj.nodename }}</li>
+              {{ obj.nodename}}</li>
           </ul>
         </el-collapse-item>
       </el-collapse>
@@ -32,13 +32,15 @@
       </div>
       <div class="right-situation el-card box-card is-always-shadow">
         <div v-if="n >= 0">
-          <div class="right-title">业务列表</div>
+          <div class="right-title">常办业务列表</div>
           <ul>
             <li v-for="(item, index) in ywList" :key="index" @click="handleSelectYw(item, ywList)"
               :class="item.cselect ? 'cactive' : ''">
               <p>
-                {{ item.nodename }}
+                {{ item.djywmc }}<br>
+                 {{ item.nodename }}
               </p>
+           
               <p v-if="item.sffqlc == 1" :class="item.userCollect==1 ? 'active' : ''"
                 @click.stop="handleCollection(item)">
                 <i class="el-icon-star-off" :class="item.userCollect==1 ? 'active' : ''"></i>