f3766f47 by renchao@pashanhoo.com

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

2 parents 738f7834 44e03a87
1 { 1 {
2 "TITLE": "不动产登记系统", 2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "/bdcdj-th", 3 "SERVERAPI": "/bdcdj",
4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0", 4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0",
5 "adapter": "dysqs-630222", 5 "adapter": "dysqs-630222",
6 "gaopaiyi": "jy" 6 "gaopaiyi": "jy"
......
...@@ -293,10 +293,7 @@ ...@@ -293,10 +293,7 @@
293 selectHSplitMerge({ ...this.queryForm }).then((res) => { 293 selectHSplitMerge({ ...this.queryForm }).then((res) => {
294 this.$endLoading(); 294 this.$endLoading();
295 if (res.code === 200) { 295 if (res.code === 200) {
296 this.tableData.datastwo = res.result 296 this.tableData.datastwo = res.result;
297 this.tableData.datastwo.forEach(item => {
298 item.bsm = item.zdbsm;
299 })
300 this.bdcdysz = this.tableData.datastwo 297 this.bdcdysz = this.tableData.datastwo
301 } 298 }
302 }) 299 })
......
...@@ -5,7 +5,7 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -5,7 +5,7 @@ export function queueDjywmc (djywbm, djqxbm) {
5 return "selectJsydsyqSplitMerge"; 5 return "selectJsydsyqSplitMerge";
6 } 6 }
7 // 房屋分割A04200S1 7 // 房屋分割A04200S1
8 if (['A04300S1', 'A04200S2', 'A04300S2'].includes(djqxbm)) { 8 if (['A04300S1', 'A04200S2', 'A0830S1'].includes(djqxbm)) {
9 return "selectFwfgSplitMerge"; 9 return "selectFwfgSplitMerge";
10 } 10 }
11 if (djqxbm == "A37100S2") { 11 if (djqxbm == "A37100S2") {
......