Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
e7c0cce7 by 杨威
Options

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

2 parents 9592692f bf0bf3d2
Expand all
Inline Side-by-side
Showing 4 changed files with 51 additions and 85 deletions
...@@ -33,3 +33,14 @@ export function dzList(data) { ...@@ -33,3 +33,14 @@ export function dzList(data) {
33 data:data 33 data:data
34 }) 34 })
35 } 35 }
36 /**
37 * 多幢分割选择自然幢列表
38 * @param data
39 */
40 export function zrzList(data) {
41 return request({
42 url:'/fw/qjZrz/zrzList',
43 method:'post',
44 data:data
45 })
46 }
......
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
294 </table> 294 </table>
295 </div> 295 </div>
296 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" 296 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
297 :isClose="true" 297 :isClose="false"
298 @close="close"> 298 @close="close">
299 </dz-query-data> 299 </dz-query-data>
300 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 300 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
...@@ -824,7 +824,12 @@ ...@@ -824,7 +824,12 @@
824 this.zdFgqData = data; 824 this.zdFgqData = data;
825 break; 825 break;
826 case "dz": 826 case "dz":
827 if (data.zrzCount < 2) {
828 this.$message.error("当前多幢下自然幢数量小于2,请重新选择")
829 break
830 }
827 this.dzFgqData = data; 831 this.dzFgqData = data;
832 this.centerDialogVisible=false;
828 break; 833 break;
829 case "h": 834 case "h":
830 this.hFgqData = data; 835 this.hFgqData = data;
......
...@@ -163,89 +163,11 @@ ...@@ -163,89 +163,11 @@
163 </div> 163 </div>
164 </el-tab-pane> 164 </el-tab-pane>
165 <el-tab-pane label="多幢合并" name="dz"> 165 <el-tab-pane label="多幢合并" name="dz">
166 <div class="hb-tabs top20"> 166 <dz-hb></dz-hb>
167 <!-- <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> -->
168 <div class="hbq">
169 <span class="tips" style="margin-left:0;">合并前多幢信息</span>
170 <table border="1">
171 <tr>
172 <td class="xh">序号</td>
173 <td class="zddm">宗地代码</td>
174 <td class="bdcdyh">不动产单元号</td>
175 <td class="xmmc">项目名称</td>
176 <td class="bdcqzh">不动产权证号</td>
177 <td class="qlr">权利人</td>
178 <td class="zl">坐落</td>
179 <td class="">
180 <el-button
181 type="primary"
182 class="changeBtn outAdd addMinus"
183 @click="newAdd"
184 >+
185 </el-button>
186 </td>
187 </tr>
188 <tr v-if="dzhbqData.length==0">
189 <td colspan="8">
190 <span class="noData">暂无数据</span>
191 </td>
192 </tr>
193 <tr v-else v-for="(item,index) in dzhbqData" :key="index">
194 <td class="xh">{{index+1}}</td>
195 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
196 readonly="readonly"/></td>
197 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
198 readonly="readonly"/></td>
199 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
200 readonly="readonly"/></td>
201 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
202 readonly="readonly"/></td>
203 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
204 readonly="readonly"/></td>
205 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
206 readonly="readonly"/></td>
207 <td class="cz">
208 <el-button
209 type="primary"
210 class="changeBtn outMinus addMinus"
211 @click="deleteData(item,index)"
212 >-
213 </el-button>
214 </td>
215 </tr>
216 </table>
217 </div>
218 <div class="hbh dzhbh">
219 <span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span>
220 <table border="1">
221 <tr>
222 <th class="xmmc">项目名称</th>
223 <th>幢信息</th>
224 </tr>
225 <tr v-for="item in dzhbhData" :key="item.bsm">
226 <td class="xmmc">
227 <input type="text" v-model="item.xmmc" class="formInput"/>
228 </td>
229 <td>
230 <!-- <span class="xz">选择</span> -->
231 </td>
232 </tr>
233 </table>
234 </div>
235 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
236 :isZdClose="true"
237 @close="close"></query-data>
238 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
239 <el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button>
240 </div>
241 </div>
242 </el-tab-pane> 167 </el-tab-pane>
243 <el-tab-pane label="户合并" name="h"> 168 <el-tab-pane label="户合并" name="h">
244 <div class="hb-tabs psn" v-if="hhbtabs"> 169 <div class="hb-tabs psn" v-if="hhbtabs">
245 <hfghb></hfghb> 170 <hfghb></hfghb>
246 <!-- <div class="header-button" :style="{width:fgBoxWidth+'px'}">
247 <el-button type="primary" class="saveBtn">保存</el-button>
248 </div> -->
249 </div> 171 </div>
250 </el-tab-pane> 172 </el-tab-pane>
251 </el-tabs> 173 </el-tabs>
...@@ -264,17 +186,16 @@ ...@@ -264,17 +186,16 @@
264 import QueryData from '@components/queryData/queryData' 186 import QueryData from '@components/queryData/queryData'
265 import zdQueryData from '@components/zdQueryData/zdQueryData' 187 import zdQueryData from '@components/zdQueryData/zdQueryData'
266 import hfghb from '../hfghb/index' 188 import hfghb from '../hfghb/index'
267 189 import dzHb from './../../../../components/dzHb/dzHb'
268 export default { 190 export default {
269 name: "", 191 name: "",
270 components: {QueryData, zdQueryData, hfghb}, 192 components: { zdQueryData, hfghb,dzHb},
271 props: {}, 193 props: {},
272 data() { 194 data() {
273 return { 195 return {
274 tabName: 'zd', 196 tabName: 'zd',
275 centerDialogVisible: false, 197 centerDialogVisible: false,
276 zdhbqData: [], // 宗地合并前数据 198 zdhbqData: [], // 宗地合并前数据
277 dzhbqData: [], // 多幢合并前数据
278 zdhbhData: {}, // 宗地合并后数据 199 zdhbhData: {}, // 宗地合并后数据
279 dzhbhData: [ 200 dzhbhData: [
280 { 201 {
...@@ -368,6 +289,31 @@ ...@@ -368,6 +289,31 @@
368 hHb() { 289 hHb() {
369 290
370 }, 291 },
292 getData(data) {
293 let arr=[];
294 switch (this.tabName) {
295 case "zd":
296 arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
297 if (arr.length > 0) {
298 this.$message.info("当前宗地已选择,请重新选择")
299 break
300 }
301 arr = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm);
302 if (arr.length > 0) {
303 this.$confirm('当前宗地不在同一地籍子区下,是否继续选择？')
304 .then(_ => {
305 this.addZdData(data);
306 })
307 .catch(_ => {
308 });
309 } else {
310 this.addZdData(data)
311 }
312 break
313 default:
314 break;
315 }
316 },
371 deleteData(item, index) { 317 deleteData(item, index) {
372 switch (this.tabName) { 318 switch (this.tabName) {
373 case "zd": 319 case "zd":
...@@ -475,7 +421,7 @@ ...@@ -475,7 +421,7 @@
475 } 421 }
476 }) 422 })
477 }, 423 },
478 getData(data) { 424 geDztData(data) {
479 let arr=[]; 425 let arr=[];
480 switch (this.tabName) { 426 switch (this.tabName) {
481 case "zd": 427 case "zd":
...@@ -502,10 +448,14 @@ ...@@ -502,10 +448,14 @@
502 this.$message.info("当前多幢已选择,请重新选择") 448 this.$message.info("当前多幢已选择,请重新选择")
503 break 449 break
504 } 450 }
505 if (this.dzhbqData.includes(data)) { 451 console.log(data,'data')
452 arr=this.dzhbqData.filter(i=>i.zdbsm !==data.zdbsm);
453 if (arr.length > 0) {
454 this.$message.info("当前选择多幢不在同一宗地下,请重新选择")
506 break 455 break
507 } 456 }
508 this.dzhbqData.push(data); 457 this.dzhbqData.push(data);
458 this.centerDialogVisible=false;
509 break 459 break
510 default: 460 default:
511 break; 461 break;
......