fix():批量室号样例修改,批量坐落规则修改,多幢分割项目名称无法输入修改,宗地分割添加自然幢数量列
Showing
5 changed files
with
139 additions
and
117 deletions
... | @@ -8,7 +8,6 @@ | ... | @@ -8,7 +8,6 @@ |
8 | :modal-append-to-body="false" | 8 | :modal-append-to-body="false" |
9 | > | 9 | > |
10 | <div> | 10 | <div> |
11 | <span class="xl" @click="xl">祥例</span> | ||
12 | <table border="1"> | 11 | <table border="1"> |
13 | <tr> | 12 | <tr> |
14 | <td>室号前缀</td> | 13 | <td>室号前缀</td> |
... | @@ -57,14 +56,6 @@ | ... | @@ -57,14 +56,6 @@ |
57 | <div class="gz"> | 56 | <div class="gz"> |
58 | <span>室号规则:{{gz}}</span> | 57 | <span>室号规则:{{gz}}</span> |
59 | </div> | 58 | </div> |
60 | </div> | ||
61 | <div> | ||
62 | <el-dialog | ||
63 | title="祥例" | ||
64 | :visible.sync="xlVisible" | ||
65 | width="50%" | ||
66 | :modal-append-to-body="false" | ||
67 | > | ||
68 | <div class="xlgz"> | 59 | <div class="xlgz"> |
69 | <span> | 60 | <span> |
70 | 样例1:10101 <span>(1单元01层01室)</span>([单元号][层号],勾选“层号自动补0”) | 61 | 样例1:10101 <span>(1单元01层01室)</span>([单元号][层号],勾选“层号自动补0”) |
... | @@ -80,7 +71,6 @@ | ... | @@ -80,7 +71,6 @@ |
80 | 样例6:1-01<span>(1单元13层01室)</span>([层号][分隔符],勾选“室号之前增加分隔符”) | 71 | 样例6:1-01<span>(1单元13层01室)</span>([层号][分隔符],勾选“室号之前增加分隔符”) |
81 | </span> | 72 | </span> |
82 | </div> | 73 | </div> |
83 | </el-dialog> | ||
84 | </div> | 74 | </div> |
85 | <div class="shop"> | 75 | <div class="shop"> |
86 | <el-button type="primary" @click="save">保存</el-button> | 76 | <el-button type="primary" @click="save">保存</el-button> |
... | @@ -109,7 +99,6 @@ | ... | @@ -109,7 +99,6 @@ |
109 | data() { | 99 | data() { |
110 | return { | 100 | return { |
111 | isVisible: false, | 101 | isVisible: false, |
112 | xlVisible: false, | ||
113 | plshData: { | 102 | plshData: { |
114 | shqz: '', | 103 | shqz: '', |
115 | selectDyh: false, | 104 | selectDyh: false, |
... | @@ -153,9 +142,6 @@ | ... | @@ -153,9 +142,6 @@ |
153 | lodding: function () { | 142 | lodding: function () { |
154 | this.$emit('lodding') | 143 | this.$emit('lodding') |
155 | }, | 144 | }, |
156 | xl: function () { | ||
157 | this.xlVisible = true; | ||
158 | }, | ||
159 | close: function () { | 145 | close: function () { |
160 | this.$emit("close") | 146 | this.$emit("close") |
161 | this.isVisible = false | 147 | this.isVisible = false |
... | @@ -204,9 +190,9 @@ | ... | @@ -204,9 +190,9 @@ |
204 | if (this.plshData.fgfA !== "") { | 190 | if (this.plshData.fgfA !== "") { |
205 | gz += this.plshData.fgfA | 191 | gz += this.plshData.fgfA |
206 | } | 192 | } |
207 | if (this.plshData.c === 1) { | 193 | if (+this.plshData.c === 1) { |
208 | gz += "[名义层]" | 194 | gz += "[名义层]" |
209 | } else if (this.plshData.c === 2) { | 195 | } else if (+this.plshData.c === 2) { |
210 | gz += "[实际层]" | 196 | gz += "[实际层]" |
211 | } | 197 | } |
212 | if (this.plshData.fgfB !== "") { | 198 | if (this.plshData.fgfB !== "") { |
... | @@ -267,7 +253,7 @@ | ... | @@ -267,7 +253,7 @@ |
267 | 253 | ||
268 | .gz { | 254 | .gz { |
269 | color: #b2b2b2; | 255 | color: #b2b2b2; |
270 | font-size: 12px; | 256 | font-size: 14px; |
271 | margin-top: 40px; | 257 | margin-top: 40px; |
272 | } | 258 | } |
273 | 259 | ... | ... |
... | @@ -262,36 +262,35 @@ | ... | @@ -262,36 +262,35 @@ |
262 | if (this.plzlData.qz !== '') { | 262 | if (this.plzlData.qz !== '') { |
263 | gz += this.plzlData.qz | 263 | gz += this.plzlData.qz |
264 | } | 264 | } |
265 | 265 | if (+this.plzlData.zd === 1) { | |
266 | if (this.plzlData.zd === 1) { | ||
267 | gz += "[宗地坐落]"; | 266 | gz += "[宗地坐落]"; |
268 | } else if (this.plzlData.zd === 2) { | 267 | } else if (+this.plzlData.zd === 2) { |
269 | gz += "[宗地名称]"; | 268 | gz += "[宗地名称]"; |
270 | } | 269 | } |
271 | 270 | ||
272 | if (this.plzlData.zrz === 1) { | 271 | if (+this.plzlData.zrz === 1) { |
273 | gz += "[自然幢坐落]" | 272 | gz += "[自然幢坐落]" |
274 | } else if (this.plzlData.zrz === 2) { | 273 | } else if (+this.plzlData.zrz === 2) { |
275 | gz += "[自然幢名称]"; | 274 | gz += "[自然幢名称]"; |
276 | } | 275 | } |
277 | if (this.plzlData.ljz === 1) { | 276 | if (+this.plzlData.ljz === 1) { |
278 | gz += "[逻辑幢名称]" | 277 | gz += "[逻辑幢名称]" |
279 | } else if (this.plzlData.ljz === 2) { | 278 | } else if (+this.plzlData.ljz === 2) { |
280 | gz += "[逻辑幢号]" | 279 | gz += "[逻辑幢号]" |
281 | } | 280 | } |
282 | if (this.plzlData.zdy === 1) { | 281 | if (+this.plzlData.zdy === 1) { |
283 | gz += "[幢单元名称]"; | 282 | gz += "[幢单元名称]"; |
284 | } else if (this.plzlData.zdy === 2) { | 283 | } else if (+this.plzlData.zdy === 2) { |
285 | gz += "[幢单元号]" | 284 | gz += "[幢单元号]" |
286 | } | 285 | } |
287 | if (this.plzlData.c === 1) { | 286 | if (+this.plzlData.c === 1) { |
288 | gz += "[名义层]" | 287 | gz += "[名义层]" |
289 | } else if (this.plzlData.c === 2) { | 288 | } else if (+this.plzlData.c === 2) { |
290 | gz += "[实际层]" | 289 | gz += "[实际层]" |
291 | } | 290 | } |
292 | if (this.plzlData.h === 1) { | 291 | if (+this.plzlData.h === 1) { |
293 | gz += "[室号]" | 292 | gz += "[室号]" |
294 | } else if (this.plzlData.h === 2) { | 293 | } else if (+this.plzlData.h === 2) { |
295 | gz += "[户号]" | 294 | gz += "[户号]" |
296 | } | 295 | } |
297 | if (this.plzlData.hz !== "") { | 296 | if (this.plzlData.hz !== "") { | ... | ... |
... | @@ -6,6 +6,7 @@ | ... | @@ -6,6 +6,7 @@ |
6 | width="70%" | 6 | width="70%" |
7 | @close="close" | 7 | @close="close" |
8 | :modal-append-to-body="false" | 8 | :modal-append-to-body="false" |
9 | :close-on-click-modal="false" | ||
9 | > | 10 | > |
10 | <div class="search"> | 11 | <div class="search"> |
11 | <el-row> | 12 | <el-row> |
... | @@ -64,6 +65,7 @@ | ... | @@ -64,6 +65,7 @@ |
64 | <td>不动产权证号</td> | 65 | <td>不动产权证号</td> |
65 | <td>权利人</td> | 66 | <td>权利人</td> |
66 | <td>坐落</td> | 67 | <td>坐落</td> |
68 | <td>自然幢数量</td> | ||
67 | </tr> | 69 | </tr> |
68 | <tr v-if="Data.length==0"> | 70 | <tr v-if="Data.length==0"> |
69 | <td colspan="8"> | 71 | <td colspan="8"> |
... | @@ -81,6 +83,7 @@ | ... | @@ -81,6 +83,7 @@ |
81 | <td>{{item.bdcqzh}}</td> | 83 | <td>{{item.bdcqzh}}</td> |
82 | <td>{{item.qlr}}</td> | 84 | <td>{{item.qlr}}</td> |
83 | <td>{{item.zl}}</td> | 85 | <td>{{item.zl}}</td> |
86 | <td>{{item.zrzCount}}</td> | ||
84 | </tr> | 87 | </tr> |
85 | </table> | 88 | </table> |
86 | </div> | 89 | </div> |
... | @@ -167,8 +170,14 @@ | ... | @@ -167,8 +170,14 @@ |
167 | this.getData(this.queryData) | 170 | this.getData(this.queryData) |
168 | }, | 171 | }, |
169 | addData: function (val) { | 172 | addData: function (val) { |
170 | this.$emit("getData", val) | 173 | let flag; |
171 | if (this.isZdClose) { | 174 | this.$emit("getData", |
175 | val | ||
176 | , i => { | ||
177 | flag = i | ||
178 | }) | ||
179 | console.log(flag,"返回值") | ||
180 | if (flag&&this.isZdClose) { | ||
172 | this.close(); | 181 | this.close(); |
173 | } | 182 | } |
174 | }, | 183 | }, |
... | @@ -234,9 +243,11 @@ | ... | @@ -234,9 +243,11 @@ |
234 | .noData { | 243 | .noData { |
235 | color: #b2b2b2; | 244 | color: #b2b2b2; |
236 | } | 245 | } |
237 | .table-bode{ | 246 | |
247 | .table-bode { | ||
238 | height: 450px; | 248 | height: 450px; |
239 | } | 249 | } |
250 | |||
240 | .page { | 251 | .page { |
241 | margin-top: 20px; | 252 | margin-top: 20px; |
242 | } | 253 | } | ... | ... |
... | @@ -237,7 +237,7 @@ | ... | @@ -237,7 +237,7 @@ |
237 | <th class="xmmc" width="300px">项目名称</th> | 237 | <th class="xmmc" width="300px">项目名称</th> |
238 | <th class="xmmc">幢信息</th> | 238 | <th class="xmmc">幢信息</th> |
239 | </tr> | 239 | </tr> |
240 | <tr v-for="(item,index) in dzFghData.fwlist" :key="index*Math.random()"> | 240 | <tr v-for="(item,index) in dzFghData.fwlist" :key="index"> |
241 | <td class="cz"> | 241 | <td class="cz"> |
242 | <el-button | 242 | <el-button |
243 | type="primary" | 243 | type="primary" |
... | @@ -258,7 +258,7 @@ | ... | @@ -258,7 +258,7 @@ |
258 | </el-select> | 258 | </el-select> |
259 | </td> | 259 | </td> |
260 | <td class="xmmc"> | 260 | <td class="xmmc"> |
261 | <input type="text" v-model="item.xmmc" class="formInput"/> | 261 | <el-input v-model="item.xmmc" ></el-input> |
262 | </td> | 262 | </td> |
263 | <td class="zxx"> | 263 | <td class="zxx"> |
264 | <div class="fghzxx"> | 264 | <div class="fghzxx"> |
... | @@ -767,10 +767,10 @@ | ... | @@ -767,10 +767,10 @@ |
767 | case 'dz': | 767 | case 'dz': |
768 | this.dzFghData.fwlist.push( | 768 | this.dzFghData.fwlist.push( |
769 | { | 769 | { |
770 | "xmmc": "", | 770 | xmmc: "", |
771 | "zrzlist": [], | 771 | zrzlist: [], |
772 | "zrzmclist": [], | 772 | zrzmclist: [], |
773 | "ztype": "zrz" | 773 | ztype: "zrz" |
774 | } | 774 | } |
775 | ); | 775 | ); |
776 | this.dzFghData.olddzbsm = this.dzFgqData.bsm; | 776 | this.dzFghData.olddzbsm = this.dzFgqData.bsm; | ... | ... |
... | @@ -137,7 +137,8 @@ | ... | @@ -137,7 +137,8 @@ |
137 | <el-card class="zrz"> | 137 | <el-card class="zrz"> |
138 | <div slot="header" class="clearfix"> | 138 | <div slot="header" class="clearfix"> |
139 | <span style="margin-right:10px">幢信息</span> | 139 | <span style="margin-right:10px">幢信息</span> |
140 | <span style="margin-right:10px"><i class="iconfont iconduochuang"></i>多幢<span style="color:red">{{zdDzList.length}}</span>幢</span> | 140 | <span style="margin-right:10px"><i class="iconfont iconduochuang"></i>多幢<span |
141 | style="color:red">{{zdDzList.length}}</span>幢</span> | ||
141 | <span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{zdZrzList.length}}</span>幢</span> | 142 | <span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{zdZrzList.length}}</span>幢</span> |
142 | </div> | 143 | </div> |
143 | <ul> | 144 | <ul> |
... | @@ -153,7 +154,8 @@ | ... | @@ -153,7 +154,8 @@ |
153 | </el-card> | 154 | </el-card> |
154 | </div> | 155 | </div> |
155 | </div> | 156 | </div> |
156 | <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true" | 157 | <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" |
158 | :isZdClose="true" | ||
157 | @close="close"></zd-query-data> | 159 | @close="close"></zd-query-data> |
158 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> | 160 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> |
159 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> | 161 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> |
... | @@ -230,7 +232,8 @@ | ... | @@ -230,7 +232,8 @@ |
230 | </tr> | 232 | </tr> |
231 | </table> | 233 | </table> |
232 | </div> | 234 | </div> |
233 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" :isZdClose="true" | 235 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" |
236 | :isZdClose="true" | ||
234 | @close="close"></query-data> | 237 | @close="close"></query-data> |
235 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> | 238 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> |
236 | <el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button> | 239 | <el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button> |
... | @@ -257,14 +260,14 @@ | ... | @@ -257,14 +260,14 @@ |
257 | getDdicByMC | 260 | getDdicByMC |
258 | } from "@api/common"; | 261 | } from "@api/common"; |
259 | import {ZdHb} from "@api/zd" | 262 | import {ZdHb} from "@api/zd" |
260 | import {saveDzHb,ZdfggetZxx} from "@api/dz" | 263 | import {saveDzHb, ZdfggetZxx} from "@api/dz" |
261 | import QueryData from '@components/queryData/queryData' | 264 | import QueryData from '@components/queryData/queryData' |
262 | import zdQueryData from '@components/zdQueryData/zdQueryData' | 265 | import zdQueryData from '@components/zdQueryData/zdQueryData' |
263 | import hfghb from '../hfghb/index' | 266 | import hfghb from '../hfghb/index' |
264 | 267 | ||
265 | export default { | 268 | export default { |
266 | name: "", | 269 | name: "", |
267 | components: {QueryData,zdQueryData,hfghb}, | 270 | components: {QueryData, zdQueryData, hfghb}, |
268 | props: {}, | 271 | props: {}, |
269 | data() { | 272 | data() { |
270 | return { | 273 | return { |
... | @@ -275,7 +278,7 @@ | ... | @@ -275,7 +278,7 @@ |
275 | zdhbhData: {}, // 宗地合并后数据 | 278 | zdhbhData: {}, // 宗地合并后数据 |
276 | dzhbhData: [ | 279 | dzhbhData: [ |
277 | { | 280 | { |
278 | xmmc:'' | 281 | xmmc: '' |
279 | } | 282 | } |
280 | ], // 多幢合并后数据 | 283 | ], // 多幢合并后数据 |
281 | hhbhData: {}, // 户合并后数据 | 284 | hhbhData: {}, // 户合并后数据 |
... | @@ -297,9 +300,9 @@ | ... | @@ -297,9 +300,9 @@ |
297 | value: "Z", | 300 | value: "Z", |
298 | } | 301 | } |
299 | ], | 302 | ], |
300 | hhbtabs:false, | 303 | hhbtabs: false, |
301 | zdDzList:[], | 304 | zdDzList: [], |
302 | zdZrzList:[], | 305 | zdZrzList: [], |
303 | } | 306 | } |
304 | }, | 307 | }, |
305 | created() { | 308 | created() { |
... | @@ -312,11 +315,11 @@ | ... | @@ -312,11 +315,11 @@ |
312 | }, | 315 | }, |
313 | methods: { | 316 | methods: { |
314 | handleClick(tab, event) { | 317 | handleClick(tab, event) { |
315 | if (tab.name == 'h') { | 318 | if (tab.name === 'h') { |
316 | this.hhbtabs = true | 319 | this.hhbtabs = true |
317 | } | 320 | } |
318 | }, | 321 | }, |
319 | save(){ | 322 | save() { |
320 | switch (this.tabName) { | 323 | switch (this.tabName) { |
321 | case "zd": | 324 | case "zd": |
322 | this.zdHb(); | 325 | this.zdHb(); |
... | @@ -329,11 +332,11 @@ | ... | @@ -329,11 +332,11 @@ |
329 | break | 332 | break |
330 | } | 333 | } |
331 | }, | 334 | }, |
332 | zdHb(){ | 335 | zdHb() { |
333 | let oldBsm= this.zdhbqData.map(function (item,index) { | 336 | let oldBsm = this.zdhbqData.map(function (item, index) { |
334 | return item.zdbsm; | 337 | return item.zdbsm; |
335 | }).join(",") | 338 | }).join(",") |
336 | let data={ | 339 | let data = { |
337 | newzddjqbsm: this.zdhbhData.djqbsm, | 340 | newzddjqbsm: this.zdhbhData.djqbsm, |
338 | newzddjzqbsm: this.zdhbhData.djzqbsm, | 341 | newzddjzqbsm: this.zdhbhData.djzqbsm, |
339 | newzdsyqlxbsm: this.zdhbhData.syqlxbsm, | 342 | newzdsyqlxbsm: this.zdhbhData.syqlxbsm, |
... | @@ -343,8 +346,8 @@ | ... | @@ -343,8 +346,8 @@ |
343 | newzdzdtzmbsm: this.zdhbhData.zdtzmbsm, | 346 | newzdzdtzmbsm: this.zdhbhData.zdtzmbsm, |
344 | oldzdbsms: oldBsm | 347 | oldzdbsms: oldBsm |
345 | } | 348 | } |
346 | console.log(data,'宗地合并数据') | 349 | console.log(data, '宗地合并数据') |
347 | ZdHb(data).then(res=>{ | 350 | ZdHb(data).then(res => { |
348 | if (res.success) { | 351 | if (res.success) { |
349 | this.$message.success("合并成功") | 352 | this.$message.success("合并成功") |
350 | this.$router.push({ | 353 | this.$router.push({ |
... | @@ -354,29 +357,29 @@ | ... | @@ -354,29 +357,29 @@ |
354 | source: 2 | 357 | source: 2 |
355 | } | 358 | } |
356 | }); | 359 | }); |
357 | }else { | 360 | } else { |
358 | this.$message.error("合并失败") | 361 | this.$message.error("合并失败") |
359 | } | 362 | } |
360 | }) | 363 | }) |
361 | }, | 364 | }, |
362 | dzHb(){ | 365 | dzHb() { |
363 | 366 | ||
364 | }, | 367 | }, |
365 | hHb(){ | 368 | hHb() { |
366 | 369 | ||
367 | }, | 370 | }, |
368 | deleteData(item,index){ | 371 | deleteData(item, index) { |
369 | switch (this.tabName) { | 372 | switch (this.tabName) { |
370 | case "zd": | 373 | case "zd": |
371 | this.zdhbqData.splice(index,1); | 374 | this.zdhbqData.splice(index, 1); |
372 | //删除幢信息中的数据 | 375 | //删除幢信息中的数据 |
373 | console.log(item); | 376 | console.log(item); |
374 | console.log(this.zdZrzList,'this.zdZrzList'); | 377 | console.log(this.zdZrzList, 'this.zdZrzList'); |
375 | this.zdZrzList = this.zdZrzList.filter(i => i.zdbsm!== item.zdbsm); | 378 | this.zdZrzList = this.zdZrzList.filter(i => i.zdbsm !== item.zdbsm); |
376 | this.zdDzList = this.zdDzList.filter(i => i.zdbsm!== item.zdbsm); | 379 | this.zdDzList = this.zdDzList.filter(i => i.zdbsm !== item.zdbsm); |
377 | break | 380 | break |
378 | case "dz": | 381 | case "dz": |
379 | this.dzhbqData.splice(index,1) | 382 | this.dzhbqData.splice(index, 1) |
380 | break | 383 | break |
381 | default: | 384 | default: |
382 | break | 385 | break |
... | @@ -448,40 +451,58 @@ | ... | @@ -448,40 +451,58 @@ |
448 | newAdd: function () { | 451 | newAdd: function () { |
449 | this.centerDialogVisible = true; | 452 | this.centerDialogVisible = true; |
450 | }, | 453 | }, |
451 | getData: function (data) { | 454 | addZdData(data) { |
452 | let arr=[]; | ||
453 | switch (this.tabName) { | ||
454 | case "zd": | ||
455 | arr=this.zdhbqData.filter(i=>i.zdbsm==data.zdbsm); | ||
456 | if (arr.length>0) { | ||
457 | break | ||
458 | } | ||
459 | this.zdhbqData.push(data); | 455 | this.zdhbqData.push(data); |
460 | ZdfggetZxx(data.zdbsm).then(res => { | 456 | ZdfggetZxx(data.zdbsm).then(res => { |
461 | if (res.success) { | 457 | if (res.success) { |
462 | console.log(res.result,'res.result'); | 458 | res.result.zrzList.forEach(item => { |
463 | res.result.zrzList.forEach(item=>{ | ||
464 | item.zdbsm = data.zdbsm | 459 | item.zdbsm = data.zdbsm |
465 | }) | 460 | }) |
466 | res.result.dzList.forEach(item=>{ | 461 | res.result.dzList.forEach(item => { |
467 | item.zdbsm = data.zdbsm | 462 | item.zdbsm = data.zdbsm |
468 | }) | 463 | }) |
469 | if(this.zdZrzList.length == 0){ | 464 | if (this.zdZrzList.length === 0) { |
470 | this.zdZrzList = res.result.zrzList | 465 | this.zdZrzList = res.result.zrzList |
471 | }else{ | 466 | } else { |
472 | this.zdZrzList = this.zdZrzList.concat(res.result.zrzList) | 467 | this.zdZrzList = this.zdZrzList.concat(res.result.zrzList) |
473 | } | 468 | } |
474 | if(this.zdDzList.length == 0){ | 469 | if (this.zdDzList.length === 0) { |
475 | this.zdDzList = res.result.dzList | 470 | this.zdDzList = res.result.dzList |
476 | }else{ | 471 | } else { |
477 | this.zdDzList = this.zdDzList.concat(res.result.dzList) | 472 | this.zdDzList = this.zdDzList.concat(res.result.dzList) |
478 | } | 473 | } |
479 | } | 474 | } |
480 | }) | 475 | }) |
476 | }, | ||
477 | async getData(data, callback) { | ||
478 | console.log(data, '选择宗地数据') | ||
479 | let flat = true; | ||
480 | switch (this.tabName) { | ||
481 | case "zd": | ||
482 | let arr = []; | ||
483 | arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm); | ||
484 | if (arr.length > 0) { | ||
485 | this.$message.info("当前宗地已选择,请重新选择") | ||
486 | callback(false) | ||
487 | break | ||
488 | } | ||
489 | arr = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm); | ||
490 | if (arr.length > 0) { | ||
491 | this.$confirm('当前宗地不在同一地籍子区下,请确认?') | ||
492 | .then(_ => { | ||
493 | this.addZdData(data) | ||
494 | }) | ||
495 | .catch(_ => { | ||
496 | flat = false; | ||
497 | }); | ||
498 | callback(flat) | ||
499 | } else { | ||
500 | this.addZdData(data) | ||
501 | } | ||
481 | break | 502 | break |
482 | case "dz": | 503 | case "dz": |
483 | arr=this.dzhbqData.filter(i=>i.glbsm==data.glbsm); | 504 | arr = this.dzhbqData.filter(i => i.glbsm === data.glbsm); |
484 | if (arr.length>0) { | 505 | if (arr.length > 0) { |
485 | break | 506 | break |
486 | } | 507 | } |
487 | if (this.dzhbqData.includes(data)) { | 508 | if (this.dzhbqData.includes(data)) { |
... | @@ -494,20 +515,20 @@ | ... | @@ -494,20 +515,20 @@ |
494 | } | 515 | } |
495 | }, | 516 | }, |
496 | //多幢合并保存 | 517 | //多幢合并保存 |
497 | dzhbSave(){ | 518 | dzhbSave() { |
498 | console.log(this.dzhbqData,'dzhbqData'); | 519 | console.log(this.dzhbqData, 'dzhbqData'); |
499 | let params = { | 520 | let params = { |
500 | fwlist:[], | 521 | fwlist: [], |
501 | newdzxmmc:this.dzhbhData[0].xmmc, | 522 | newdzxmmc: this.dzhbhData[0].xmmc, |
502 | zdbsm:'' | 523 | zdbsm: '' |
503 | } | 524 | } |
504 | this.dzhbqData.forEach(item=>{ | 525 | this.dzhbqData.forEach(item => { |
505 | params.fwlist.push({ | 526 | params.fwlist.push({ |
506 | zbsm:item.bsm, | 527 | zbsm: item.bsm, |
507 | ztype:item.dylx | 528 | ztype: item.dylx |
508 | }) | 529 | }) |
509 | }) | 530 | }) |
510 | this.$nextTick(()=>{ | 531 | this.$nextTick(() => { |
511 | console.log(params); | 532 | console.log(params); |
512 | //TODO 调用保存接口 | 533 | //TODO 调用保存接口 |
513 | // saveDzHb(params).then((res) => { | 534 | // saveDzHb(params).then((res) => { |
... | @@ -568,9 +589,11 @@ | ... | @@ -568,9 +589,11 @@ |
568 | } | 589 | } |
569 | } | 590 | } |
570 | } | 591 | } |
571 | .psn{ | 592 | |
572 | position: unset!important; | 593 | .psn { |
594 | position: unset !important; | ||
573 | } | 595 | } |
596 | |||
574 | .hb-tabs { | 597 | .hb-tabs { |
575 | height: auto; | 598 | height: auto; |
576 | width: 100%; | 599 | width: 100%; |
... | @@ -666,13 +689,13 @@ | ... | @@ -666,13 +689,13 @@ |
666 | margin-left: 20px; | 689 | margin-left: 20px; |
667 | } | 690 | } |
668 | .hbq { | 691 | .hbq { |
669 | margin:14px 20px 20px 20px; | 692 | margin: 14px 20px 20px 20px; |
670 | } | 693 | } |
671 | .dzhbh{ | 694 | .dzhbh { |
672 | box-sizing: border-box!important; | 695 | box-sizing: border-box !important; |
673 | padding: 0 18px 0 0!important; | 696 | padding: 0 18px 0 0 !important; |
674 | margin-top: 10px!important; | 697 | margin-top: 10px !important; |
675 | display: block!important; | 698 | display: block !important; |
676 | } | 699 | } |
677 | .hbh { | 700 | .hbh { |
678 | margin-left: 20px; | 701 | margin-left: 20px; |
... | @@ -681,7 +704,7 @@ | ... | @@ -681,7 +704,7 @@ |
681 | display: flex; | 704 | display: flex; |
682 | flex-direction: column; | 705 | flex-direction: column; |
683 | flex-flow: nowrap; | 706 | flex-flow: nowrap; |
684 | .data{ | 707 | .data { |
685 | width: 40%; | 708 | width: 40%; |
686 | float: left; | 709 | float: left; |
687 | } | 710 | } |
... | @@ -689,27 +712,27 @@ | ... | @@ -689,27 +712,27 @@ |
689 | border: 1px solid #E6E6E6; | 712 | border: 1px solid #E6E6E6; |
690 | background-color: white; | 713 | background-color: white; |
691 | overflow: auto; | 714 | overflow: auto; |
692 | .clearfix{ | 715 | .clearfix { |
693 | span{ | 716 | span { |
694 | color: #9B9B9B; | 717 | color: #9B9B9B; |
695 | } | 718 | } |
696 | } | 719 | } |
697 | /deep/ .el-card__body{ | 720 | /deep/ .el-card__body { |
698 | padding:10px 12px; | 721 | padding: 10px 12px; |
699 | } | 722 | } |
700 | ul { | 723 | ul { |
701 | li { | 724 | li { |
702 | padding: 5px; | 725 | padding: 5px; |
703 | line-height: 20px; | 726 | line-height: 20px; |
704 | color: #4A4A4A; | 727 | color: #4A4A4A; |
705 | .label{ | 728 | .label { |
706 | vertical-align: middle; | 729 | vertical-align: middle; |
707 | color: #4A4A4A; | 730 | color: #4A4A4A; |
708 | display: inline-block; | 731 | display: inline-block; |
709 | width: 104px; | 732 | width: 104px; |
710 | text-align: right; | 733 | text-align: right; |
711 | } | 734 | } |
712 | .value{ | 735 | .value { |
713 | vertical-align: middle; | 736 | vertical-align: middle; |
714 | color: #6D7278; | 737 | color: #6D7278; |
715 | display: inline-block; | 738 | display: inline-block; |
... | @@ -718,17 +741,17 @@ | ... | @@ -718,17 +741,17 @@ |
718 | word-break: break-all; | 741 | word-break: break-all; |
719 | } | 742 | } |
720 | } | 743 | } |
721 | .hasChoosed{ | 744 | .hasChoosed { |
722 | color: #BBB; | 745 | color: #BBB; |
723 | } | 746 | } |
724 | } | 747 | } |
725 | .zdjbxx{ | 748 | .zdjbxx { |
726 | width: 100%; | 749 | width: 100%; |
727 | height: 320px; | 750 | height: 320px; |
728 | margin-bottom: 10px; | 751 | margin-bottom: 10px; |
729 | float: left; | 752 | float: left; |
730 | } | 753 | } |
731 | .zdmap{ | 754 | .zdmap { |
732 | width: calc(100% - 380px); | 755 | width: calc(100% - 380px); |
733 | height: 200px; | 756 | height: 200px; |
734 | float: left; | 757 | float: left; |
... | @@ -746,12 +769,12 @@ | ... | @@ -746,12 +769,12 @@ |
746 | text-align: center; | 769 | text-align: center; |
747 | padding: 5px 0; | 770 | padding: 5px 0; |
748 | } | 771 | } |
749 | /deep/ .el-card__body{ | 772 | /deep/ .el-card__body { |
750 | height: 200px; | 773 | height: 200px; |
751 | overflow-y: scroll; | 774 | overflow-y: scroll; |
752 | position: relative; | 775 | position: relative; |
753 | } | 776 | } |
754 | .line{ | 777 | .line { |
755 | width: 1px; | 778 | width: 1px; |
756 | height: calc(100% - 20px); | 779 | height: calc(100% - 20px); |
757 | background-color: #EDEDED; | 780 | background-color: #EDEDED; |
... | @@ -762,8 +785,8 @@ | ... | @@ -762,8 +785,8 @@ |
762 | .dz { | 785 | .dz { |
763 | width: 33%; | 786 | width: 33%; |
764 | overflow: auto; | 787 | overflow: auto; |
765 | ul{ | 788 | ul { |
766 | li{ | 789 | li { |
767 | width: 96% !important; | 790 | width: 96% !important; |
768 | } | 791 | } |
769 | } | 792 | } |
... | @@ -784,12 +807,12 @@ | ... | @@ -784,12 +807,12 @@ |
784 | text-align: left; | 807 | text-align: left; |
785 | line-height: 20px; | 808 | line-height: 20px; |
786 | display: inline-block; | 809 | display: inline-block; |
787 | .label{ | 810 | .label { |
788 | width: 90px; | 811 | width: 90px; |
789 | } | 812 | } |
790 | } | 813 | } |
791 | li:nth-of-type(even){ | 814 | li:nth-of-type(even) { |
792 | .label{ | 815 | .label { |
793 | width: 110px; | 816 | width: 110px; |
794 | text-indent: 20px; | 817 | text-indent: 20px; |
795 | } | 818 | } |
... | @@ -798,13 +821,16 @@ | ... | @@ -798,13 +821,16 @@ |
798 | } | 821 | } |
799 | } | 822 | } |
800 | } | 823 | } |
801 | .cz{ | 824 | |
825 | .cz { | ||
802 | color: blue; | 826 | color: blue; |
803 | } | 827 | } |
804 | .cz:hover{ | 828 | |
829 | .cz:hover { | ||
805 | color: blue; | 830 | color: blue; |
806 | text-decoration: underline; | 831 | text-decoration: underline; |
807 | } | 832 | } |
833 | |||
808 | /deep/ .el-select { | 834 | /deep/ .el-select { |
809 | width: 100%; | 835 | width: 100%; |
810 | } | 836 | } | ... | ... |
-
Please register or sign in to post a comment