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

 import request from '@/utils/request'
 import SERVER from './config'
 // 初始化内容
-export function Init (data) {
+export function Init(data) {
     let apiUrl = "";
     switch (data.get("djlx")) {
         case "100":
-            apiUrl = "/ywbl/fdcq2lr/fristInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/fristInit";
             break;
         case "200":
-            apiUrl = "/ywbl/fdcq2lr/transferInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/transferInit";
             break;
         case "300":
-            apiUrl = "/ywbl/fdcq2lr/changeInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/changeInit";
             break;
         case "400":
-            apiUrl = "/ywbl/fdcq2lr/logoutInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/logoutInit";
             break;
         case "500":
-            apiUrl = "/ywbl/fdcq2lr/riviseInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/riviseInit";
             break;
         case "901":
-            apiUrl = "/ywbl/fdcq2lr/renewalInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/renewalInit";
             break;
         case "902":
-            apiUrl = "/ywbl/fdcq2lr/replaceInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/replaceInit";
             break;
     }
     return request({
@@ -32,10 +32,18 @@ export function Init (data) {
         data
     })
 }
-// 初始化内容
-export function saveData (data) {
+// 注销登记提交数据
+export function saveLogoutData(data) {
+    return request({
+        url: '/ywbl/fdcq2lr/saveLogoutData',
+        method: 'post',
+        data
+    })
+}
+// 首次登记提交
+export function saveBatchData(data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/fdcq2lr/saveData',
+    url: '/ywbl/fdcq2lr/saveBatchData',
     method: 'post',
     data
   })

@@ -162,3 +162,13 @@ export function deleteBdcdy (data) {
         showLoading: true
     })
 }
+
+// 获取自然幢下其他户
+export function selectOtherH (data) {
+    return request({
+        url: 'ywbl/ywsq/selectOtherH',
+        method: 'post',
+        data,
+        showLoading: true
+    })
+}
\ No newline at end of file

@@ -20,9 +20,9 @@ export function getForm(tabName, djywbm) {
         case "fwsyqslxx300":
             form = require("@/views/ywbl/fdcq2/slxx300.vue");
             break;
-        // case "fwsyqslxx400":
-        //     form = require("@/views/ywbl/fdcq2/slxx400.vue");
-        //     break;
+         case "fwsyqslxx400":
+             form = require("@/views/ywbl/fdcq2/slxx400.vue");
+             break;
         case "tdslxxCfdj":
             form = require("@/views/ywbl/cfdj/tdslxx.vue");
             break;

@@ -51,7 +51,7 @@
           查封不动产列表
           <div class="triangle"></div>
         </div>
-        <cfBdcdyTable :tableData="ruleForm.qlxx" />
+        <cfBdcdyTable :tableData="ruleForm.yqlxxList" />
         <div class="slxx_title title-block">
           批量查封信息
           <div class="triangle"></div>

@@ -58,6 +58,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人：" prop="qlxx.qlrmc">
+              <el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
+              <el-input disabled v-model="ruleForm.qlxx.qlrzjhm"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
+              <el-input disabled v-model="ruleForm.qlxx.qlrzjzl"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：" prop="qlxx.bdcdyh">
               <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
             </el-form-item>
@@ -80,23 +97,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10">
-           <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人：" prop="qlxx.qlrmc">
-              <el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
-              <el-input disabled v-model="ruleForm.qlxx.qlrzjhm"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
-              <el-input disabled v-model="ruleForm.qlxx.qlrzjzl"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <div class="slxx_title title-block">
           查封信息
           <div class="triangle"></div>
@@ -173,7 +173,7 @@
 </template>
 <script>
 import sqrViewTable from "@/views/workflow/components/sqrViewTable";
-import { Init, saveData } from "@/api/cfdjFlow.js";
+import { BatchInit, saveData } from "@/api/cfdjFlow.js";
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -194,8 +194,9 @@ export default {
     this.ableEdit = this.$parent.showBatch;
     var formdata = new FormData();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
+    formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
     formdata.append("djlx", this.propsParam.djlx);
-    Init(formdata).then((res) => {
+    BatchInit(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result
       }

 <template>
   <div class="from-clues">
     <div class="from-clues-header">
-      <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tabs v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
         <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
         <el-tab-pane label="户" name="h"></el-tab-pane>
       </el-tabs>
@@ -45,7 +45,7 @@ import Cookies from 'js-cookie'
 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 } from "@/api/ywbl.js";
+import { selectScBdcdy, startBusinessFlow, choiceBdcdy,selectOtherH } from "@/api/ywbl.js";
 export default {
   mixins: [table, jump],
   props: {
@@ -78,6 +78,8 @@ export default {
       this.$emit("closeDialog");
     },
     fetchData () {
+      if(!this.isJump){
+        //从业务办理进入
         this.queryForm.sqywbm = this.djywbm;
         this.queryForm.fwfl = this.activeName;
         selectScBdcdy({ ...this.queryForm, ...this.pageData  }).then((res) => {
@@ -87,6 +89,18 @@ export default {
             this.tableData.data = records;
           }
         })
+      }else{
+        //从办理框架选择不动产单元进入
+        //房屋首次办理选择不动产需找出对应自然幢下未选择的户
+        this.queryForm.bsmSlsq = this.$route.query.bsmSlsq;
+        selectOtherH({ ...this.queryForm, ...this.pageData  }).then((res) => {
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.tableData.total = total;
+            this.tableData.data = records;
+          }
+        })
+      }
     },
     handleTabClick () {
       this.pageData.currentPage = 1;