Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
88f248f0 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 046250b0 11e812e3
Inline Side-by-side
Showing 5 changed files with 22 additions and 10 deletions
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 <el-button type="primary" @click="save">保存</el-button> 64 <el-button type="primary" @click="save">保存</el-button>
65 <el-button type="primary" @click="close">取消</el-button> 65 <el-button type="primary" @click="close">取消</el-button>
66 </div> 66 </div>
67 <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" 67 <zd-query-data :isCxlz = true :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
68 :isZdClose="true"></zd-query-data> 68 :isZdClose="true"></zd-query-data>
69 </el-dialog> 69 </el-dialog>
70 </template> 70 </template>
......
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
64 <th>不动产权证号</th> 64 <th>不动产权证号</th>
65 <th>权利人</th> 65 <th>权利人</th>
66 <th>坐落</th> 66 <th>坐落</th>
67 <th>自然幢数量</th> 67 <th v-if="isCxlz">自然幢数量</th>
68 </tr> 68 </tr>
69 <tr v-if="Data.length===0"> 69 <tr v-if="Data.length===0">
70 <td colspan="8"> 70 <td :colspan="isCxlz ? 9:8">
71 <span class="noData">暂无数据</span> 71 <span class="noData">暂无数据</span>
72 </td> 72 </td>
73 </tr> 73 </tr>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 <td>{{item.bdcqzh}}</td> 82 <td>{{item.bdcqzh}}</td>
83 <td>{{item.qlrmc}}</td> 83 <td>{{item.qlrmc}}</td>
84 <td>{{item.zl}}</td> 84 <td>{{item.zl}}</td>
85 <td>{{item.zrzCount}}</td> 85 <td v-if="isCxlz">{{item.zrzCount}}</td>
86 </tr> 86 </tr>
87 </table> 87 </table>
88 </div> 88 </div>
...@@ -134,6 +134,10 @@ ...@@ -134,6 +134,10 @@
134 isZdClose: { 134 isZdClose: {
135 type: Boolean, 135 type: Boolean,
136 default: false 136 default: false
137 },
138 isCxlz:{
139 type: Boolean,
140 default: false
137 } 141 }
138 }, 142 },
139 mounted() { 143 mounted() {
...@@ -169,7 +173,7 @@ ...@@ -169,7 +173,7 @@
169 this.getData(this.queryData) 173 this.getData(this.queryData)
170 }, 174 },
171 addData: function (val) { 175 addData: function (val) {
172 if (val.zrzCount < 1) { 176 if (this.isCxlz &&val.zrzCount < 1) {
173 this.$message.warning("当前宗地下没有自然幢,请重新选择") 177 this.$message.warning("当前宗地下没有自然幢,请重新选择")
174 return 178 return
175 } 179 }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li> 15 <li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li>
16 <li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li> 16 <li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li>
17 <li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li> 17 <li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li>
18 <li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlr}}</span></li> 18 <li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlrmc}}</span></li>
19 <li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li> 19 <li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li>
20 </ul> 20 </ul>
21 <div class="zdmap"> 21 <div class="zdmap">
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
133 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 133 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
134 </div> 134 </div>
135 </el-tab-pane> 135 </el-tab-pane>
136 <el-tab-pane class="eltabspane" label="构筑物" name="gzw"> 136 <el-tab-pane class="eltabspane" v-if="!createZrz" label="构筑物" name="gzw">
137 <el-form :inline="true" :rules="rules4" :model="ruleForm4" ref="ruleForm4" class="demo-form-inline"> 137 <el-form :inline="true" :rules="rules4" :model="ruleForm4" ref="ruleForm4" class="demo-form-inline">
138 <el-form-item label="项目名称" class="w100" prop="xmmc"> 138 <el-form-item label="项目名称" class="w100" prop="xmmc">
139 <el-input 139 <el-input
......
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
47 methods: { 47 methods: {
48 loadingStatus() { 48 loadingStatus() {
49 console.log("是否禁用") 49 console.log("是否禁用")
50 let bsm=this.$store.state.zdbsm; 50 let bsm=this.$route.query.bsm;
51 queryStatus(bsm).then(res => { 51 queryStatus(bsm).then(res => {
52 if (res.success) { 52 if (res.success) {
53 let qszt = res.result.qszt; 53 let qszt = res.result.qszt;
...@@ -89,8 +89,16 @@ export default { ...@@ -89,8 +89,16 @@ export default {
89 }, 89 },
90 created() {}, 90 created() {},
91 mounted() {}, 91 mounted() {},
92 computed: {}, 92 computed: {
93 watch: {}, 93 zdbsm() {
94 return this.$route.query.bsm;
95 },
96 },
97 watch: {
98 zdbsm: function (val) {
99 this.loadingStatus();
100 },
101 },
94 }; 102 };
95 </script> 103 </script>
96 <style scoped lang="less"> 104 <style scoped lang="less">
......