Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -128,7 +128,8 @@
                     xmmc: "",
                     zddm: "",
                     zl: ""
-                }
+                };
+                this.getData(this.queryData)
             },
             getData: function (data) {
                 getSearchList(data).then(res => {
@@ -179,6 +180,10 @@
         cursor: pointer;
     }
 
+    .inputtitle {
+        line-height: 40px;
+    }
+
     .shop {
         margin-top: 20px;
     }

@@ -31,7 +31,7 @@
                 </tr>
             </table>
         </div>
-        <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" @close="closepop"></query-data>
+        <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" @close="close"></query-data>
     </div>
 </template>
 
@@ -53,7 +53,7 @@
         mounted() {
         },
         methods: {
-            closepop: function () {
+            close: function () {
                 this.centerDialogVisible = false;
             },
             newAdd: function () {
@@ -106,9 +106,6 @@
             cursor: pointer;
         }
 
-        .inputtitle {
-            line-height: 40px;
-        }
         .noData {
             color: #b2b2b2;
         }

@@ -53,18 +53,19 @@
     import SearchHead from "../../../../components/searchHead/searchHead";
     import {getSearchList} from "../../../../api/search";
     import {copyZdjbxx} from "../../../../api/common";
+
     export default {
         name: "",
         components: {SearchHead},
         props: {},
         data() {
             return {
-                qszt:2,
+                qszt: 2,
                 total: 0,
                 pageNo: 1,
                 pageSize: 10,
                 tableData: [],
-                tableHeight: "",
+                tableHeight: "100px",
                 queryData: {}
             };
         },
@@ -112,28 +113,30 @@
                 console.log('fwsxbg');
                 console.log(row);
                 var bsm = row.glbsm;
-                var type ;
+                var type;
                 let path = "";
                 switch (row.dylx) {
                     case "zrz":
-                        type="1";
+                        type = "1";
+                        this.$store.state.zrzbsm = row.glbsm
                         path = "/zrz";
                         break;
                     case "zd":
-                        type ="0";
+                        type = "0";
                         this.$store.state.zdbsm = row.glbsm;
                         path = "/zd";
                         break;
                     case "h":
-                        type="2"
+                        type = "2"
+                        this.$store.state.hbsm = row.glbsm
                         break;
                     default:
                         break;
                 }
-                var params = {"id":bsm,"type":type};
+                var params = {"id": bsm, "type": type};
                 copyZdjbxx(params)
-                    .then((res =>{
-                        if(res.code==200){
+                    .then((res => {
+                        if (res.code == 200) {
                             this.$message({
                                 message: res.message,
                                 type: "success",

@@ -34,12 +34,11 @@
                 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
             </tr>
         </table>
-        <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" @close="closepop"></query-data>
+        <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" @close="close"></query-data>
     </div>
 </template>
 
 <script>
-    import {getSearchList} from './../../../../api/search'
     import QueryData from './../../../../components/queryData/queryData'
 
     export default {
@@ -57,6 +56,9 @@
         mounted() {
         },
         methods: {
+            close: function () {
+                this.centerDialogVisible = false;
+            },
             newAdd: function () {
                 this.centerDialogVisible = true;
             },
@@ -119,9 +121,6 @@
             cursor: pointer;
         }
 
-        .inputtitle {
-            line-height: 40px;
-        }
         .noData {
             color: #b2b2b2;
         }