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

@@ -311,15 +311,12 @@
         }
         }
       },
       },
       handleLpbClick (item) {
       handleLpbClick (item) {
+        console.log("item",item);
          this.$popup('楼盘表', 'lpb/index', {
          this.$popup('楼盘表', 'lpb/index', {
           width: '85%',
           width: '85%',
           formData: {
           formData: {
             bsm: item.bsm,
             bsm: item.bsm,
-            zrzbsm: item.bsm,
-            zdbsm: item.zdbsm,
-            bsmSqyw: this.bsmSqyw,
-            djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-            djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+
           }
           }
         })
         })
       },
       },

@@ -242,7 +242,7 @@
        * @param {*} row
        * @param {*} row
        * @author: renchao
        * @author: renchao
        */
        */
-      openBook (row) {
+      openDialog (row) {
         var param = {
         var param = {
           bdcdyid: row.bdcdyid,
           bdcdyid: row.bdcdyid,
           qllx: row.qllx,
           qllx: row.qllx,

@@ -97,7 +97,6 @@ class data extends filter {
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div>
             <div>
-              <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
             </div>
           )
           )

@@ -192,9 +192,16 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleLpbClick (item) {
       handleLpbClick (item) {
-        this.$popupDialog('楼盘表', 'lpb/index', {
-          bsm: ''
-        }, '85%')
+        console.log("item",item);
+         this.$popup('楼盘表', 'lpb/index', {
+          width: '85%',
+          formData: {
+            bsm: item.zrzbsm,
+            zrzbsm: item.zrzbsm,
+            zdbsm: item.zrzbsm,
+
+          }
+        })
       }
       }
     }
     }
   }
   }

@@ -89,11 +89,20 @@
           }
           }
         })
         })
       },
       },
-      /**
-       * @description: moreQueryClick
-       * @author: renchao
-       */
-      moreQueryClick () { }
+    openDialog(){
+        this.$popup('楼盘表', 'lpb/index', {
+          width: '85%',
+          formData: {
+            bsm: item.bsm,
+            zrzbsm: item.bsm,
+            zdbsm: item.zdbsm,
+            bsmSqyw: this.bsmSqyw,
+            // onlyShow: true,
+            djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
+            djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+          }
+        })
+      }
     }
     }
   }
   }
 </script>
 </script>