Merge remote-tracking branch 'origin/master'

@@ -33,4 +33,17 @@ export function saveZrzInfo (data) {
         method: 'put',
         method: 'put',
         data:data
         data:data
     })
     })
+}
+
+/**
+ * 保存自然幢信息
+ */
+export function getZrzDetailByBsm (data) {
+    return request({
+        url: '/fw/qjZrz/getQjZrzDetailById',
+        method: 'get',
+        params:{
+            id:data
+        }
+    })
 }
 }
\ No newline at end of file

@@ -50,7 +50,7 @@
 			width="50%"
 			width="50%"
 			center
 			center
 		>
 		>
-			<el-form :model="form">
+			<el-form :model="formData">
 				<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
 				<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
 					<tr>
 					<tr>
 						<td colspan="2">权利人名称<i class="requisite">*</i></td>
 						<td colspan="2">权利人名称<i class="requisite">*</i></td>
@@ -279,6 +279,7 @@ export default {
 				gyqlrqk: "",
 				gyqlrqk: "",
 				sm: "",
 				sm: "",
 			},
 			},
+			qllxList:[],
 		};
 		};
 	},
 	},
 	methods: {
 	methods: {

@@ -179,6 +179,11 @@ export default {
 			pzytList:[],
 			pzytList:[],
 			sjytList:[],
 			sjytList:[],
 			djList:[],
 			djList:[],
+			compareList: [
+				{label: "=", value: "="},
+				{label: "<=", value: "<="},
+				{label: ">=", value: ">="},
+			],
 			countList: [
 			countList: [
 				{
 				{
 					id: Math.random(),
 					id: Math.random(),

@@ -245,7 +245,7 @@ export default {
 						this.$store.zrzbsm=res.result.bsm;
 						this.$store.zrzbsm=res.result.bsm;
 						this.$store.xmmc=res.result.xmmc;
 						this.$store.xmmc=res.result.xmmc;
 						this.$router.push({
 						this.$router.push({
-							path: '/zrz', query:{data: res.result}
+							path: '/zrz', query:{source: 1}
 						});
 						});
 					} else {
 					} else {
 						this.$message.error("创建失败！");
 						this.$message.error("创建失败！");

@@ -112,17 +112,23 @@ export default {
 		//点击办理
 		//点击办理
 		handleClick(row) {
 		handleClick(row) {
 			let path = "";
 			let path = "";
-			switch (row.lx) {
-				case "自然幢":
+			switch (row.dylx) {
+				case "zrz":
 					path = "/zrz";
 					path = "/zrz";
 					break;
 					break;
-				case "宗地":
+				case "zd":
 					path = "/zd";
 					path = "/zd";
 					break;
 					break;
 				default:
 				default:
 					break;
 					break;
 			}
 			}
-			this.$router.push(path);
+			this.$router.push({
+				path:path,
+				query:{
+					bsm:row.glbsm,
+					source:2
+				}
+			});
 		},
 		},
 	},
 	},
 	computed: {},
 	computed: {},

@@ -269,7 +269,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";
-    import {getBdcdyh,saveZrzInfo} from "../../../api/zrz"
+    import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
     import {getQjZdjbxxDetailById} from "../../../api/zd"
     import {getQjZdjbxxDetailById} from "../../../api/zd"
     import {getDdicByMC} from "../../../api/common"
     import {getDdicByMC} from "../../../api/common"
     export default {
     export default {
@@ -351,6 +351,7 @@
                 ytTitleRowspan:1,  //用途的单元格垂直合并数量
                 ytTitleRowspan:1,  //用途的单元格垂直合并数量
                 fwjgTitleRowspan:1,  //房屋结构的单元格垂直合并数量
                 fwjgTitleRowspan:1,  //房屋结构的单元格垂直合并数量
                 loading:false,
                 loading:false,
+                source:'',
             }
             }
         },
         },
         methods: {
         methods: {
@@ -528,6 +529,14 @@
                     }
                     }
                 })
                 })
             },
             },
+            getZrzDetailByBsm(data){
+                getZrzDetailByBsm(data).then((res)=>{
+                    if(res.code===200){
+                        console.log(res.result)
+                        this.form=res.result;
+                    }
+                })
+            }
         },
         },
         created(){
         created(){
 
 
@@ -535,10 +544,17 @@
         mounted() {
         mounted() {
             this.getDDic();
             this.getDDic();
             //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
             //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
-            this.form.zdbsm=this.$store.zdbsm;
-            this.getZddm(this.$store.zdbsm);
-            this.form.xmmc=this.$store.xmmc;
-            this.form.zrzbsm=this.$store.zrzbsm;
+            this.source = this.$route.query.source;
+            //source为1代表是从新建中进入道该页面的，source为2代表是从综合查询进入到该页面的
+            if(this.source===1){
+                this.form.zdbsm=this.$store.zdbsm;
+                this.getZddm(this.$store.zdbsm);
+                this.form.xmmc=this.$store.xmmc;
+                this.form.zrzbsm=this.$store.zrzbsm;
+            }else {
+                this.getZrzDetailByBsm(this.$route.query.bsm)
+            }
+
         }
         }
     }
     }
 </script>
 </script>