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

 {
 {
   "TITLE": "不动产登记系统",
   "TITLE": "不动产登记系统",
-  "SERVERAPI": "/bdcdj",
+  "SERVERAPI": "/bdcdj-th",
   "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0",
   "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0",
   "adapter": "dysqs-630222",
   "adapter": "dysqs-630222",
   "gaopaiyi": "jy"
   "gaopaiyi": "jy"

@@ -207,6 +207,35 @@ export function selectFwsyq (data) {
     data
     data
   })
   })
 }
 }
+
+/**
+ * 业务办理-选择权利信息-根据条件进行列表查询
+ * @param data
+ * @returns {*}
+ */
+export function selectFwsyqQlxxSplitMergeBefore (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectFwsyqQlxxSplitMergeBefore',
+    method: 'post',
+    data
+  })
+}
+
+
+/**
+ * 业务办理-选择权利信息-根据条件进行列表查询
+ * @param data
+ * @returns {*}
+ */
+export function selectHSplitMerge (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHSplitMerge',
+    method: 'post',
+    data
+  })
+}
+
+
 /**
 /**
  * 业务办理-预告登记-选择权利信息-根据条件进行列表查询
  * 业务办理-预告登记-选择权利信息-根据条件进行列表查询
  * @param data
  * @param data

@@ -147,7 +147,7 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectFwfgSplitMerge.js";
   import { datas, sendThis } from "../javascript/selectFwfgSplitMerge.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectFwsyq, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMerge } from "@/api/ywsq.js";
+  import { selectFwsyqQlxxSplitMergeBefore, selectJsydQlxxSplitMergeBefore, selectHSplitMerge } from "@/api/ywsq.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
   export default {
     mixins: [ywsqTable, jump],
     mixins: [ywsqTable, jump],
@@ -185,12 +185,12 @@
       handleSelect () {
       handleSelect () {
         this.tableData.data.forEach(item => {
         this.tableData.data.forEach(item => {
           if (this.radioVal == item.bdcdyh) {
           if (this.radioVal == item.bdcdyh) {
-            item.bglx = '1'
+            //item.bglx = '1'
             this.bdcdysz[0] = item
             this.bdcdysz[0] = item
             this.queryForm.bhqkbsm = item.bhqkbsm
             this.queryForm.bhqkbsm = item.bhqkbsm
           }
           }
         })
         })
-        selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
+        selectHSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           this.$endLoading();
           if (res.code === 200) {
           if (res.code === 200) {
             this.tableData.datastwo = res.result
             this.tableData.datastwo = res.result
@@ -208,7 +208,7 @@
       queryClick () {
       queryClick () {
         this.$startLoading();
         this.$startLoading();
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
-        selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
+        selectFwsyqQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
           this.$endLoading();
           this.$endLoading();
           if (res.code === 200) {
           if (res.code === 200) {
             this.tableData.data = res.result.records
             this.tableData.data = res.result.records
@@ -289,10 +289,8 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleRowClick (row) {
       handleRowClick (row) {
-        this.queryForm.bhqkbsm = row.bhqkbsm
-        this.radioVal = row.bdcdyh
-        row.bglx = '1'
-        selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
+        this.queryForm.bhqkbsm = row.bhqkbsm       
+        selectHSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           this.$endLoading();
           if (res.code === 200) {
           if (res.code === 200) {
             this.tableData.datastwo = res.result
             this.tableData.datastwo = res.result

@@ -4,8 +4,8 @@ export function queueDjywmc (djywbm, djqxbm) {
     if (djqxbm == "A0320099" || djqxbm == "A0330099") {
     if (djqxbm == "A0320099" || djqxbm == "A0330099") {
         return "selectJsydsyqSplitMerge";
         return "selectJsydsyqSplitMerge";
     }
     }
-    // 房屋分割
-    if (['A04300S1', 'A04200S1', 'A04300S2'].includes(djqxbm)) {
+    // 房屋分割A04200S1
+    if (['A04300S1', 'A04200S2', 'A04300S2'].includes(djqxbm)) {
         return "selectFwfgSplitMerge";
         return "selectFwfgSplitMerge";
     }
     }
     if (djqxbm == "A37100S2") {
     if (djqxbm == "A37100S2") {