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

@@ -208,6 +208,7 @@
             },
             },
             cancel: function () {
             cancel: function () {
                 console.log("cancel......")
                 console.log("cancel......")
+                this.close();
             },
             },
             close: function () {
             close: function () {
                 this.$emit("close")
                 this.$emit("close")
@@ -216,6 +217,16 @@
             },
             },
             result: function () {
             result: function () {
                 console.log("重置")
                 console.log("重置")
+                this.plzlData = {
+                    qz: '',
+                    zd: '',
+                    zrz: '',
+                    ljz: '',
+                    zdy: '',
+                    c: '',
+                    h: '',
+                    hz: ''
+                }
             }
             }
         },
         },
         computed: {
         computed: {

@@ -375,7 +375,7 @@
 
 
 <script>
 <script>
     import Qlr from "./../../../../../components/formMenu/qlr";
     import Qlr from "./../../../../../components/formMenu/qlr";
-    import Qlxz from "./../../../../../components/formMenu/qlxz";
+    import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
     export default {
     export default {
         name:'zrz',
         name:'zrz',
         components:{
         components:{