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

 import request from '@/utils/request'
 import request from '@/utils/request'
 import SERVER from './config'
 import SERVER from './config'
 // 初始化内容
 // 初始化内容
-export function Init (data) {
+export function Init(data) {
     let apiUrl = "";
     let apiUrl = "";
     switch (data.get("djlx")) {
     switch (data.get("djlx")) {
         case "100":
         case "100":
-            apiUrl = "/ywbl/fdcq2lr/fristInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/fristInit";
             break;
             break;
         case "200":
         case "200":
-            apiUrl = "/ywbl/fdcq2lr/transferInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/transferInit";
             break;
             break;
         case "300":
         case "300":
-            apiUrl = "/ywbl/fdcq2lr/changeInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/changeInit";
             break;
             break;
         case "400":
         case "400":
-            apiUrl = "/ywbl/fdcq2lr/logoutInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/logoutInit";
             break;
             break;
         case "500":
         case "500":
-            apiUrl = "/ywbl/fdcq2lr/riviseInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/riviseInit";
             break;
             break;
         case "901":
         case "901":
-            apiUrl = "/ywbl/fdcq2lr/renewalInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/renewalInit";
             break;
             break;
         case "902":
         case "902":
-            apiUrl = "/ywbl/fdcq2lr/replaceInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/replaceInit";
             break;
             break;
     }
     }
     return request({
     return request({
@@ -32,10 +32,18 @@ export function Init (data) {
         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({
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/fdcq2lr/saveData',
+    url: '/ywbl/fdcq2lr/saveBatchData',
     method: 'post',
     method: 'post',
     data
     data
   })
   })

@@ -13,6 +13,16 @@ export function selectScBdcdy(data) {
     })
     })
 }
 }
 
 
+export function selectZdjbxx(data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
+        method: 'post',
+        data,
+        showLoading: true
+    })
+}
+
+
 /* 
 /* 
 选择建设用地用地查询方法
 选择建设用地用地查询方法
 */
 */

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

@@ -44,7 +44,8 @@ import { datas, sendThis } from "../javascript/jsydsyq100.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
 import jump from "../components/mixin/jump";
-import { selectScBdcdy, startBusinessFlow } from "@/api/ywbl.js";
+import {  startBusinessFlow } from "@/api/ywbl.js";
+import { selectZdjbxx } from "@/api/selectQlxx.js";
 export default {
 export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {
@@ -76,7 +77,7 @@ export default {
     fetchData () {
     fetchData () {
       this.queryForm.sqywbm = this.djywbm;
       this.queryForm.sqywbm = this.djywbm;
 
 
-      selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
+      selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           let { total, records } = res.result;
           let { total, records } = res.result;
           this.tableData.total = total;
           this.tableData.total = total;

@@ -60,11 +60,11 @@ class data extends filter {
         label: "不动产单元号",
         label: "不动产单元号",
       },
       },
       {
       {
-        prop: "showQlxz",
+        prop: "qlxzmc",
         label: "权利性质",
         label: "权利性质",
       },
       },
       {
       {
-        prop: "zdmj",
+        prop: "mj",
         label: "宗地面积(㎡)",
         label: "宗地面积(㎡)",
       },
       },
       {
       {
@@ -72,7 +72,7 @@ class data extends filter {
         label: "权利设定方式",
         label: "权利设定方式",
       },
       },
       {
       {
-        prop: "showTdyt",
+        prop: "ytmc",
         label: "土地用途",
         label: "土地用途",
       },
       },
       {
       {