Merge remote-tracking branch 'origin/master'

@@ -17,9 +17,9 @@
 							<span class="span" @click="delRow">删除</span>
 							<span class="span" @click="delRow">删除</span>
 						</el-col>
 						</el-col>
 						<el-col :span="4" class="fr" v-show="qszt!='0'">
 						<el-col :span="4" class="fr" v-show="qszt!='0'">
-							<span class="noEdit" @click="addRow">新增</span>
-							<span class="noEdit" @click="changeRow">修改</span>
-							<span class="noEdit" @click="delRow">删除</span>
+							<span class="noEdit" >新增</span>
+							<span class="noEdit" >修改</span>
+							<span class="noEdit" >删除</span>
 						</el-col>
 						</el-col>
 					</el-row>
 					</el-row>
 				</td>
 				</td>

@@ -105,6 +105,7 @@
 								:disabled="formData.qszt!='0'"
 								:disabled="formData.qszt!='0'"
 								v-model="childItem.tdsyqssj"
 								v-model="childItem.tdsyqssj"
 								type="date"
 								type="date"
+								
 								value-format="yyyy-MM-dd"
 								value-format="yyyy-MM-dd"
 								placeholder="选择日期"
 								placeholder="选择日期"
 							>
 							>
@@ -134,7 +135,6 @@
 								type="text"
 								type="text"
 								style="top: -1px;"
 								style="top: -1px;"
 								:disabled="formData.qszt!='0'"
 								:disabled="formData.qszt!='0'"
-								
 								v-model="childItem.pzytdm"
 								v-model="childItem.pzytdm"
 								class="formInput"
 								class="formInput"
 							/>
 							/>
@@ -143,7 +143,6 @@
 							<input
 							<input
 								type="text"
 								type="text"
 								:disabled="formData.qszt!='0'"
 								:disabled="formData.qszt!='0'"
-								
 								v-model="childItem.sjytdm"
 								v-model="childItem.sjytdm"
 								class="formInput"
 								class="formInput"
 							/>
 							/>
@@ -151,8 +150,8 @@
 						<li>
 						<li>
 							<input
 							<input
 								type="text"
 								type="text"
-								:disabled="formData.qszt!='0'"
 								
 								
+								:disabled="formData.qszt!='0'"
 								v-model="childItem.syqx"
 								v-model="childItem.syqx"
 								class="formInput"
 								class="formInput"
 							/>
 							/>
@@ -212,6 +211,7 @@
 								:disabled="formData.qszt!='0'"
 								:disabled="formData.qszt!='0'"
 								v-model="childItem.tdsyjssj"
 								v-model="childItem.tdsyjssj"
 								type="date"
 								type="date"
+								
 								value-format="yyyy-MM-dd"
 								value-format="yyyy-MM-dd"
 								placeholder="选择日期"
 								placeholder="选择日期"
 							>
 							>

@@ -47,7 +47,8 @@ const store = new Vuex.Store({
         hbsm:'',
         hbsm:'',
         contentWidth:'',  //内容区域宽度
         contentWidth:'',  //内容区域宽度
         zrzh:'', //自然幢号
         zrzh:'', //自然幢号
-        dzbsm:'' // 多幢bsm
+        dzbsm:'', // 多幢bsm
+        treeData:[], // 树数据
     },
     },
     modules: {
     modules: {
         user,
         user,

@@ -177,9 +177,11 @@ export default {
 		"$store.state.zdbsm": function(bsm) {
 		"$store.state.zdbsm": function(bsm) {
 			this.getRightTree(bsm);
 			this.getRightTree(bsm);
 		},
 		},
-		// "$store.state.zdbsms":function (zdbsms) {
-		// 	this.getTreeByS(zdbsms)
-        // }
+		
+		"$store.state.treeData":function (val) {
+			console.log(val,'val');
+			this.pd = val;
+        }
 	},
 	},
 	mounted(){
 	mounted(){
 
 

@@ -20,7 +20,6 @@ import jzx from "./jzx";
 import djb from "./djb";
 import djb from "./djb";
 import lshs from "./lshs";
 import lshs from "./lshs";
 import fjcl from "./fjcl/fjcl"
 import fjcl from "./fjcl/fjcl"
-import {queryjzd,queryjzx} from "@/api/zd"
 export default {
 export default {
 	name: "",
 	name: "",
 	components: {
 	components: {
@@ -30,34 +29,12 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			activeName: "djdcb",
 			activeName: "djdcb",
-      jzd:[],
-      jzx:[]
 		};
 		};
 	},
 	},
 	methods: {
 	methods: {
 		handleClick(tab, event) {
 		handleClick(tab, event) {
 			// console.log(tab, event);
 			// console.log(tab, event);
 		},
 		},
-    //查询界址点
-    getJZD(){
-		  var bsm =  this.$store.state.zdbsm;
-		  this.jzx = [];
-      queryjzd({glBsm:bsm}).then(res => {
-        if(res.code == 200){
-            this.jzd = res.data.data;
-        }
-      })
-    },
-    //查询界址线
-    getJZX(){
-        var bsm =  this.$store.state.zdbsm;
-        this.jzx = [];
-        queryjzx({glBsm:bsm}).then(res => {
-            if(res.code = 200){
-                this.jzx = res.data.data;
-            }
-        });
-    }
 	},
 	},
 	created() {},
 	created() {},
 	mounted() {},
 	mounted() {},

@@ -339,7 +339,7 @@
 			</table>
 			</table>
 
 
 			<div style="min-height: 40px;text-align: center;margin-top: 10px">
 			<div style="min-height: 40px;text-align: center;margin-top: 10px">
-				<el-button type="success" @click="updateZDxx()">保存</el-button>
+				<el-button type="success" @click="updateZDxx">保存</el-button>
 				<el-button type="primary" @click="submitZDxx">提交</el-button>
 				<el-button type="primary" @click="submitZDxx">提交</el-button>
 			</div>
 			</div>
 		</div>
 		</div>
@@ -349,12 +349,13 @@
 <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 {submit} from "../../../api/common"
 import {
 import {
 	getAllList,
 	getAllList,
 	getDdicByMC,
 	getDdicByMC,
 	getListByXzqbsm,
 	getListByXzqbsm,
 	getListByPbsm,
 	getListByPbsm,
+	submit,
+	getTree,
 } from "../../../api/common";
 } from "../../../api/common";
 import {
 import {
 	getBdcdyh,
 	getBdcdyh,
@@ -623,11 +624,16 @@ export default {
 				status:1,
 				status:1,
 				type:"zd"
 				type:"zd"
 			}
 			}
-
 			submit(data).then((res)=>{
 			submit(data).then((res)=>{
 				if(res.code===200){
 				if(res.code===200){
-					this.$message.success("提交完成！")
-					this.getZdjbxxData(this.$store.state.zdbsm);
+					this.$message.success("提交成功！")
+					this.getZdjbxxData(this.curZdbsm);
+					getTree(this.curZdbsm).then((res) => {
+						if (res.success) {
+							// console.log('successsuccesssuccesssuccess');
+							this.$store.state.treeData = res.result;
+						}
+					});
 				}
 				}
 			})
 			})
 		},
 		},