Merge remote-tracking branch 'origin/master'

@@ -64,7 +64,7 @@
                 <el-button type="primary" @click="save">保存</el-button>
                 <el-button type="primary" @click="close">取消</el-button>
             </div>
-            <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
+            <zd-query-data :isCxlz = true :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
                         :isZdClose="true"></zd-query-data>
         </el-dialog>
 </template>

@@ -64,10 +64,10 @@
                             <th>不动产权证号</th>
                             <th>权利人</th>
                             <th>坐落</th>
-                            <th>自然幢数量</th>
+                            <th v-if="isCxlz">自然幢数量</th>
                         </tr>
                         <tr v-if="Data.length===0">
-                            <td colspan="8">
+                            <td :colspan="isCxlz ? 9:8">
                                 <span class="noData">暂无数据</span>
                             </td>
                         </tr>
@@ -82,7 +82,7 @@
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.qlrmc}}</td>
                             <td>{{item.zl}}</td>
-                            <td>{{item.zrzCount}}</td>
+                            <td  v-if="isCxlz">{{item.zrzCount}}</td>
                         </tr>
                     </table>
                 </div>
@@ -134,6 +134,10 @@
             isZdClose: {
                 type: Boolean,
                 default: false
+            },
+            isCxlz:{
+                type: Boolean,
+                default: false
             }
         },
         mounted() {
@@ -169,7 +173,7 @@
                 this.getData(this.queryData)
             },
             addData: function (val) {
-                if (val.zrzCount < 1) {
+                if (this.isCxlz &&val.zrzCount < 1) {
                     this.$message.warning("当前宗地下没有自然幢,请重新选择")
                     return
                 }

@@ -15,7 +15,7 @@
                                 <li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li>
                                 <li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li>
                                 <li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li>
-                                <li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlr}}</span></li>
+                                <li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlrmc}}</span></li>
                                 <li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li>
                             </ul>
                             <div class="zdmap">

@@ -133,7 +133,7 @@
 				<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
 			</div>
 		</el-tab-pane>
-		<el-tab-pane class="eltabspane" label="构筑物" name="gzw">
+		<el-tab-pane class="eltabspane"  v-if="!createZrz" label="构筑物" name="gzw">
 			<el-form :inline="true" :rules="rules4" :model="ruleForm4" ref="ruleForm4" class="demo-form-inline">
 				<el-form-item label="项目名称" class="w100" prop="xmmc">
 					<el-input

@@ -47,7 +47,7 @@ export default {
 	methods: {
         loadingStatus() {
             console.log("是否禁用")
-            let bsm=this.$store.state.zdbsm;
+            let bsm=this.$route.query.bsm;
             queryStatus(bsm).then(res => {
                 if (res.success) {
                     let qszt = res.result.qszt;
@@ -89,8 +89,16 @@ export default {
 	},
 	created() {},
 	mounted() {},
-	computed: {},
-	watch: {},
+	computed: {
+		zdbsm() {
+			return this.$route.query.bsm;
+		},
+	},
+	watch: {
+		zdbsm: function (val) {
+			this.loadingStatus();
+		},
+	},
 };
 </script>
 <style scoped lang="less">