7629dad2 by renchao@pashanhoo.com

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

2 parents 5f593c46 0a7109da
...@@ -311,15 +311,12 @@ ...@@ -311,15 +311,12 @@
311 } 311 }
312 }, 312 },
313 handleLpbClick (item) { 313 handleLpbClick (item) {
314 this.$popup('楼盘表', 'lpb/index', { 314 console.log("item",item);
315 this.$popup('楼盘表', 'lpb/index', {
315 width: '85%', 316 width: '85%',
316 formData: { 317 formData: {
317 bsm: item.bsm, 318 bsm: item.bsm,
318 zrzbsm: item.bsm, 319
319 zdbsm: item.zdbsm,
320 bsmSqyw: this.bsmSqyw,
321 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
322 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
323 } 320 }
324 }) 321 })
325 }, 322 },
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
242 * @param {*} row 242 * @param {*} row
243 * @author: renchao 243 * @author: renchao
244 */ 244 */
245 openBook (row) { 245 openDialog (row) {
246 var param = { 246 var param = {
247 bdcdyid: row.bdcdyid, 247 bdcdyid: row.bdcdyid,
248 qllx: row.qllx, 248 qllx: row.qllx,
......
...@@ -97,7 +97,6 @@ class data extends filter { ...@@ -97,7 +97,6 @@ class data extends filter {
97 render: (h, scope) => { 97 render: (h, scope) => {
98 return ( 98 return (
99 <div> 99 <div>
100 <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
101 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button> 100 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
102 </div> 101 </div>
103 ) 102 )
......
...@@ -192,9 +192,16 @@ ...@@ -192,9 +192,16 @@
192 * @author: renchao 192 * @author: renchao
193 */ 193 */
194 handleLpbClick (item) { 194 handleLpbClick (item) {
195 this.$popupDialog('楼盘表', 'lpb/index', { 195 console.log("item",item);
196 bsm: '' 196 this.$popup('楼盘表', 'lpb/index', {
197 }, '85%') 197 width: '85%',
198 formData: {
199 bsm: item.zrzbsm,
200 zrzbsm: item.zrzbsm,
201 zdbsm: item.zrzbsm,
202
203 }
204 })
198 } 205 }
199 } 206 }
200 } 207 }
......
...@@ -89,11 +89,20 @@ ...@@ -89,11 +89,20 @@
89 } 89 }
90 }) 90 })
91 }, 91 },
92 /** 92 openDialog(){
93 * @description: moreQueryClick 93 this.$popup('楼盘表', 'lpb/index', {
94 * @author: renchao 94 width: '85%',
95 */ 95 formData: {
96 moreQueryClick () { } 96 bsm: item.bsm,
97 zrzbsm: item.bsm,
98 zdbsm: item.zdbsm,
99 bsmSqyw: this.bsmSqyw,
100 // onlyShow: true,
101 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
102 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
103 }
104 })
105 }
97 } 106 }
98 } 107 }
99 </script> 108 </script>
......