Merge remote-tracking branch 'origin/master'

@@ -243,7 +243,9 @@ export default {
 			console.log(this.zdData,'this.zdData');
 			this.dialogVisible = true;
 			this.$store.state.zdbsm = this.zdData.zdbsm;
-			this.$store.state.dzbsm = this.zdData.bsm;
+			if(this.zdData.type == 'dz'){
+				this.$store.state.dzbsm = this.zdData.bsm;
+			}
 		},
 		//关闭添加定着物弹框
 		closeDialog() {

@@ -47,9 +47,9 @@
 								<el-checkbox label="dz" name="type">多幢</el-checkbox>
 								<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
 								<el-checkbox label="h" name="type">户</el-checkbox>
-								<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
+								<!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
 								<el-checkbox label="lq" name="type">林权</el-checkbox>
-								<el-checkbox label="zh" name="type">宗海</el-checkbox>
+								<el-checkbox label="zh" name="type">宗海</el-checkbox> -->
 							</el-checkbox-group>
 						</el-form-item>
 					</el-form>

@@ -82,7 +82,7 @@
 				</el-form-item>
 			</el-form>
 		</el-tab-pane>
-		<el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane>
+		<!-- <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane> -->
 		<el-tab-pane class="eltabspane" label="自然幢" name="zrz">
 			<el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject">
 				<el-form-item label="项目名称" prop="xmmc">
@@ -115,8 +115,8 @@
 				</el-form-item>
 			</el-form>
 		</el-tab-pane>
-		<el-tab-pane class="eltabspane" label="林权" name="lq">林权</el-tab-pane>
-		<el-tab-pane class="eltabspane" label="构筑物" name="gzw">构筑物</el-tab-pane>
+		<!-- <el-tab-pane class="eltabspane" label="林权" name="lq">林权</el-tab-pane>
+		<el-tab-pane class="eltabspane" label="构筑物" name="gzw">构筑物</el-tab-pane> -->
 	</el-tabs>
 </template>
 <script>
@@ -217,10 +217,10 @@ export default {
 	},
 	methods: {
 	    // 重置
-	    result(){
-            this.$refs['ruleForm'].resetFields()
-            this.$refs["ruleForm1"].resetFields()
-            this.$refs["ruleForm2"].resetFields()
+	    reset(){
+            this.$refs['ruleForm'].resetFields();
+            this.$refs["ruleForm1"].resetFields();
+            this.$refs["ruleForm2"].resetFields();
 		},
 		handleClick(tab, event) {
 			console.log(tab, event);
@@ -260,13 +260,13 @@ export default {
 					this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
 					insertZrzjbxx(this.ruleForm1)
 						.then((res) => {
+								debugger
 							if (res.code == "200") {
 								this.$message({
 									message: "创建成功！",
 									type: "success",
 								});
 								//todo 跳转到自然幢基本信息内容表页面  (预留)
-								this.close();
 								this.$store.state.zdbsm=res.result.zdbsm;
 								this.$store.state.zrzbsm=res.result.bsm;
 								this.$store.state.xmmc=res.result.xmmc;
@@ -276,6 +276,7 @@ export default {
 										bsm:res.result.bsm
 									}
 								});
+								this.close();
 							} else {
 								this.$message.error("创建失败！");
 							}
@@ -370,7 +371,7 @@ export default {
 		},
 		close() {
 			this.$emit("closeDialog");
-			this.result();
+			this.reset();
 		},
 	},
 	computed: {},

@@ -53,6 +53,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		scyclx:{
+			type: String,
+			default: "1",
+		},
 	},
 	data() {
 		return {
@@ -67,7 +71,7 @@ export default {
                 zdymc:"",
 				zdybsm: "",
 				zrzbsm: "",
-				scyclx: "0",
+				scyclx: "1",
 				qsc: "",
 				jsc: "",
 				hs: "",
@@ -130,7 +134,7 @@ export default {
 					ljzbsm: "",
 					zdybsm: "",
 					zrzbsm: "",
-					scyclx: "0",
+					scyclx: this.scyclx,
 					qsc: "",
 					jsc: "",
 					hs: "",
@@ -165,6 +169,13 @@ export default {
 			immediate: true,
 			deep: true,
 		},
+		scyclx:{
+			handler(n){
+				this.$nextTick(()=>{ 
+					this.formData.scyclx = this.scyclx;
+				})
+			}
+		}
 	},
 };
 </script>

@@ -411,7 +411,11 @@
             Qlxz,
         },
         props:{
-            bsm:String //户标识码
+            bsm:String, //户标识码
+            scyclx:{
+                type: String,
+                default: "1",
+            },
         },
         data () {
             return {
@@ -792,6 +796,15 @@
                         this.form.bdcdyh=res.result;
                     })
             },
+        },
+        watch: {
+            scyclx:{
+                handler(n){
+                    this.$nextTick(()=>{ 
+                        this.form.scyclx = this.scyclx;
+                    })
+                }
+            }
         }
     }
 </script>

@@ -224,6 +224,7 @@
 			<div class="addCh" v-show="menuType == 'ch'">
 				<addCh
 					ref="ch"
+					:scyclx="scyclx"
 					:dialogVisible="dialogVisible"
 					:treeData="treeData"
 				></addCh>
@@ -248,7 +249,7 @@
 		></h-cxlz>
 		<!-- 双击户的弹出框 -->
 		<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
-			<hbj ref="hbj" :bsm="hbsm"></hbj>
+			<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
 			<div class="btnGroup">
 				<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
 				<el-button type="primary" @click="hbjResetInfo">重置</el-button>
@@ -572,7 +573,7 @@ export default {
 		plScYcChange() {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
-				scyclx: "0",
+				scyclx: this.scyclx,
 			};
 			batchScYcChange(data).then((res) => {
 				if (res.code === 200) {
@@ -606,7 +607,7 @@ export default {
 		getDyztBsmList() {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
-				scyclx: "0",
+				scyclx: this.scyclx,
 			};
 			getLpbTj(data).then((res) => {
 				if (res.code === 200) {
@@ -663,7 +664,7 @@ export default {
 		getLpbFwytAndQlxz(){
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
-				scyclx: "0",
+				scyclx: this.scyclx,
 			};
 			getLpbFwytAndQlxz(data).then((res) => {
 				if (res.code === 200) {