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

@@ -174,5 +174,15 @@ export function loadFile(url) {
             url
         }
     })
+}
 
+/**
+ *  多个宗地代码获取树的数据信息
+ */
+export function getListMenu(data) {
+    return request({
+        url:'/system/xzq/getZdListMenu',
+        method:'post',
+         data:data
+    })
 }

@@ -10,6 +10,7 @@ const store = new Vuex.Store({
     state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
         zddm:'',        // 宗地代码
         zdbsm: '',      // 宗地标识码
+        zdbsms:[],        // 宗地标识码集合
         xmmc: '',       // 项目名称
         zdmj: '',        // 宗地面积
         zdzl: '',         // 宗地坐落

@@ -58,7 +58,7 @@ import Navigation from "../components/IvyElement/navigation";
 import Create from "./panel/create/index";
 import LineTree from "../components/lineTree/lineTree";
 import { setTimeout } from "timers";
-import { getTree,getDdicByMC,getTreeList,getTreeByBsm } from "../api/common";
+import { getTree,getDdicByMC,getTreeList,getTreeByBsm,getListMenu } from "../api/common";
 
 export default {
 	components: {
@@ -153,7 +153,12 @@ export default {
 				}
 			});
 			if (newPath == "/zd") {
+				//source为3时代表时分割后的宗地信息
+				if(this.$route.query.source == '3'){
+					this.getTreeByS(this.$store.state.zdbsms);
+				}else{
 					this.getRightTree(this.$store.state.zdbsm);
+				}
 			}else if (newPath == "/zrz") {
 				this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
 			}else if(newPath == "/dz"){
@@ -172,6 +177,9 @@ export default {
 		"$store.state.zdbsm": function(bsm) {
 			this.getRightTree(bsm);
 		},
+		// "$store.state.zdbsms":function (zdbsms) {
+		// 	this.getTreeByS(zdbsms)
+        // }
 	},
 	mounted(){
 
@@ -245,6 +253,14 @@ export default {
 		});
 	},
 	methods: {
+        getTreeByS(zdbsms){
+            getListMenu(zdbsms).then(res=>{
+                if (res.success) {
+                    this.pd=res.result
+                }
+			})
+		},
+
 		//请求字典数据
 		async getDic() {
 			let s = this.$store.state;

@@ -843,11 +843,12 @@
                 zdfg(this.zdFghData).then(res => {
                     if (res.success) {
                         Message.success('保存成功')
+                        this.$store.state.zdbsms=res.result;
                         this.$router.push({
                             path: '/zd',
                             query: {
                                 bsm: res.result[0],
-                                source: 2
+                                source: 3, //分割标识
                             }
                         });
                     } else {

@@ -444,6 +444,13 @@
                 ZdHb(data).then(res=>{
                     if (res.success) {
                      this.$message.success("合并成功")
+                        this.$router.push({
+                            path: '/zd',
+                            query: {
+                                bsm: res.result,
+                                source: 2
+                            }
+                        });
                     }else {
                         this.$message.error("合并失败")
                     }