Merge remote-tracking branch 'origin/master' into master
# Conflicts: # src/assets/iconfont/demo_index.html # src/assets/iconfont/iconfont.css # src/assets/iconfont/iconfont.eot # src/assets/iconfont/iconfont.js # src/assets/iconfont/iconfont.json # src/assets/iconfont/iconfont.svg # src/assets/iconfont/iconfont.ttf # src/assets/iconfont/iconfont.woff # src/assets/iconfont/iconfont.woff2 # src/components/map/ChangeMap.vue # src/views/systemTX/map.vue # src/views/systemTX/mapWeight/mapTools.vue # src/views/systemTX/mapWeight/sideTools.vue
Showing
54 changed files
with
1400 additions
and
671 deletions
1 | VUE_APP_api = 'http://192.168.2.108:8000' | 1 | VUE_APP_api = 'https://192.168.2.111:8006' |
2 | VUE_APP_api1 = 'http://192.168.2.76:8000' | 2 | VUE_APP_api1 = 'https://127.0.0.1:8006' |
3 | VUE_APP_api2 = 'http://192.168.2.108:8006' | 3 | VUE_APP_api2 = 'https://192.168.2.9:8006' |
4 | VUE_APP_api5 = 'http://192.168.2.59:8443' | 4 | VUE_APP_api3 = 'https://192.168.2.11:8006' |
5 | VUE_APP_api3 = 'https://127.0.0.1:8006' | 5 | VUE_APP_api4 = 'http://192.168.2.111:18080' |
6 | VUE_APP_api4 = 'http://127.0.0.1:18080' | ||
7 | VUE_APP_name = '开发环境' | 6 | VUE_APP_name = '开发环境' |
8 | NODE_ENV="development" | 7 | NODE_ENV="development" |
9 | VUE_APP_VERSION = 'psh' | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
8 | VUE_APP_VERSION = 'psh' | ... | ... |
src/api/c.js
0 → 100644
1 | import request from '@/plugin/axios' | ||
2 | |||
3 | /** | ||
4 | * 查询层基本信息 | ||
5 | */ | ||
6 | export function getQjCDetailById(data) { | ||
7 | return request({ | ||
8 | url: '/system/qjC/getQjCDetailById', | ||
9 | method: 'get', | ||
10 | params: { | ||
11 | id: data, | ||
12 | } | ||
13 | }) | ||
14 | } | ||
15 | |||
16 | /** | ||
17 | * 更新保存层基本信息 | ||
18 | */ | ||
19 | export function updateQjC(data) { | ||
20 | return request({ | ||
21 | url: '/system/qjC/updateQjC', | ||
22 | method: 'put', | ||
23 | data: data, | ||
24 | }) | ||
25 | } | ||
26 |
src/api/ljz.js
0 → 100644
1 | import request from '@/plugin/axios' | ||
2 | |||
3 | /** | ||
4 | * 查询逻辑幢基本信息 | ||
5 | */ | ||
6 | export function getQjLjzDetailById(data) { | ||
7 | return request({ | ||
8 | url: '/system/qjLjz/getQjLjzDetailById', | ||
9 | method: 'get', | ||
10 | params: { | ||
11 | id: data, | ||
12 | } | ||
13 | }) | ||
14 | } | ||
15 | |||
16 | /** | ||
17 | * 更新保存逻辑幢基本信息 | ||
18 | */ | ||
19 | export function updateQjLjz(data) { | ||
20 | return request({ | ||
21 | url: '/system/qjLjz/updateQjLjz', | ||
22 | method: 'put', | ||
23 | data: data, | ||
24 | }) | ||
25 | } | ||
26 |
... | @@ -43,4 +43,19 @@ export function getQlrInfoByGlbsm(data) { | ... | @@ -43,4 +43,19 @@ export function getQlrInfoByGlbsm(data) { |
43 | glbsm:data | 43 | glbsm:data |
44 | }, | 44 | }, |
45 | }) | 45 | }) |
46 | } | ||
47 | |||
48 | /** | ||
49 | * 更新权利人共有公用情况 | ||
50 | */ | ||
51 | export function updateGyGyQlrQk(glbsm,type,gyqkbsm) { | ||
52 | return request({ | ||
53 | url: '/system/Qlr/updateGyGyQlrQk', | ||
54 | method: 'get', | ||
55 | params: { | ||
56 | glbsm:glbsm, | ||
57 | type:type, | ||
58 | gyqkbsm:gyqkbsm, | ||
59 | }, | ||
60 | }) | ||
46 | } | 61 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -44,3 +44,29 @@ export function zrzList(data) { | ... | @@ -44,3 +44,29 @@ export function zrzList(data) { |
44 | data:data | 44 | data:data |
45 | }) | 45 | }) |
46 | } | 46 | } |
47 | |||
48 | /** | ||
49 | * 查询宗地、自然幢等权属状态 | ||
50 | * @param bsm | ||
51 | */ | ||
52 | export function queryStatus(bsm) { | ||
53 | return request({ | ||
54 | url:"/system/basiccommon/query-status", | ||
55 | method:'get', | ||
56 | params:{ | ||
57 | bsm | ||
58 | } | ||
59 | }) | ||
60 | } | ||
61 | |||
62 | /** | ||
63 | * 范围属性变更查询 | ||
64 | * @param data | ||
65 | */ | ||
66 | export function queryFwsxbg(data) { | ||
67 | return request({ | ||
68 | url:"/system/basiccommon/query-fwsxbg", | ||
69 | method:"post", | ||
70 | data:data | ||
71 | }) | ||
72 | } | ... | ... |
src/api/zdy.js
0 → 100644
1 | import request from '@/plugin/axios' | ||
2 | |||
3 | /** | ||
4 | * 查询幢单元基本信息 | ||
5 | */ | ||
6 | export function getQjZdyDetailById(data) { | ||
7 | return request({ | ||
8 | url: '/system/qjZdy/getQjZdyDetailById', | ||
9 | method: 'get', | ||
10 | params: { | ||
11 | id: data, | ||
12 | } | ||
13 | }) | ||
14 | } | ||
15 | |||
16 | /** | ||
17 | * 更新保存幢单元基本信息 | ||
18 | */ | ||
19 | export function updateQjZdy(data) { | ||
20 | return request({ | ||
21 | url: '/system/qjZdy/updateQjZdy', | ||
22 | method: 'put', | ||
23 | data: data, | ||
24 | }) | ||
25 | } | ||
26 |
... | @@ -227,6 +227,34 @@ ol, ul { list-style:none; } | ... | @@ -227,6 +227,34 @@ ol, ul { list-style:none; } |
227 | right: 6px; | 227 | right: 6px; |
228 | top: 4px; | 228 | top: 4px; |
229 | } | 229 | } |
230 | // 增删操作按钮样式 | ||
231 | .addMinus{ | ||
232 | border-radius:50%; | ||
233 | width: 30px !important; | ||
234 | height: 30px !important; | ||
235 | font-size: 22px!important; | ||
236 | padding: 4px 6px; | ||
237 | } | ||
238 | .outAdd,.outAdd:hover:focus{ | ||
239 | background-color: #2FA5FF!important; | ||
240 | border: 1px solid #2FA5FF!important; | ||
241 | color: #fff!important; | ||
242 | } | ||
243 | .inAdd,.inAdd:hover:focus{ | ||
244 | border: 1px solid #2FA5FF!important; | ||
245 | background-color: #fff!important; | ||
246 | color: #2FA5FF!important; | ||
247 | } | ||
248 | .outMinus,.outMinus:hover:focus{ | ||
249 | background-color: #FA6400!important; | ||
250 | border: 1px solid #FA6400!important; | ||
251 | color: #fff!important; | ||
252 | } | ||
253 | .inMinus,.inMinus:hover:focus{ | ||
254 | border: 1px solid #FA6400!important; | ||
255 | background-color: #fff!important; | ||
256 | color: #FA6400!important; | ||
257 | } | ||
230 | .import{ | 258 | .import{ |
231 | background-color: #00CACD!important; | 259 | background-color: #00CACD!important; |
232 | border-color: #00CACD!important; | 260 | border-color: #00CACD!important; | ... | ... |
... | @@ -17,7 +17,7 @@ | ... | @@ -17,7 +17,7 @@ |
17 | <el-button style="border:0;padding:0 10px" @click="newAddDz"> | 17 | <el-button style="border:0;padding:0 10px" @click="newAddDz"> |
18 | <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>多幢 | 18 | <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>多幢 |
19 | </el-button> | 19 | </el-button> |
20 | <el-button style="border:0;padding:0 10px" @click="newAddDz"> | 20 | <el-button style="border:0;padding:0 10px" @click="newAddZrz"> |
21 | <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>自然幢 | 21 | <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>自然幢 |
22 | </el-button> | 22 | </el-button> |
23 | </template> | 23 | </template> |
... | @@ -245,7 +245,7 @@ | ... | @@ -245,7 +245,7 @@ |
245 | <td>{{item.bdcdyh}}</td> | 245 | <td>{{item.bdcdyh}}</td> |
246 | <td>{{item.xmmc}}</td> | 246 | <td>{{item.xmmc}}</td> |
247 | <td>{{item.bdcqzh}}</td> | 247 | <td>{{item.bdcqzh}}</td> |
248 | <td>{{item.qlr}}</td> | 248 | <td>{{item.qlrmc}}</td> |
249 | <td>{{item.zl}}</td> | 249 | <td>{{item.zl}}</td> |
250 | <td>{{item.zrzCount}}</td> | 250 | <td>{{item.zrzCount}}</td> |
251 | </tr> | 251 | </tr> |
... | @@ -328,7 +328,7 @@ | ... | @@ -328,7 +328,7 @@ |
328 | <td>权利人</td> | 328 | <td>权利人</td> |
329 | <td>坐落</td> | 329 | <td>坐落</td> |
330 | </tr> | 330 | </tr> |
331 | <tr v-if="Data.length==0"> | 331 | <tr v-if="Data.length===0"> |
332 | <td colspan="8"> | 332 | <td colspan="8"> |
333 | <span class="noData">暂无数据</span> | 333 | <span class="noData">暂无数据</span> |
334 | </td> | 334 | </td> |
... | @@ -342,7 +342,7 @@ | ... | @@ -342,7 +342,7 @@ |
342 | <td>{{item.bdcdyh}}</td> | 342 | <td>{{item.bdcdyh}}</td> |
343 | <td>{{item.xmmc}}</td> | 343 | <td>{{item.xmmc}}</td> |
344 | <td>{{item.bdcqzh}}</td> | 344 | <td>{{item.bdcqzh}}</td> |
345 | <td>{{item.qlr}}</td> | 345 | <td>{{item.qlrmc}}</td> |
346 | <td>{{item.zl}}</td> | 346 | <td>{{item.zl}}</td> |
347 | </tr> | 347 | </tr> |
348 | </table> | 348 | </table> |
... | @@ -424,25 +424,26 @@ | ... | @@ -424,25 +424,26 @@ |
424 | methods: { | 424 | methods: { |
425 | getZdData(id) { | 425 | getZdData(id) { |
426 | getQjZdjbxxDetailById(id).then(res => { | 426 | getQjZdjbxxDetailById(id).then(res => { |
427 | this.dzhbhData.xzqbsm = res.result.xzqbsm | 427 | this.dzhbhData.xzqbsm = res.result.xzqbsm; |
428 | this.changeXzq(this.dzhbhData.xzqbsm) | 428 | this.changeXzq(this.dzhbhData.xzqbsm); |
429 | this.dzhbhData.djqbsm = res.result.djqbsm | 429 | this.dzhbhData.djqbsm = res.result.djqbsm; |
430 | this.changeDjq(this.dzhbhData.djqbsm) | 430 | this.changeDjq(this.dzhbhData.djqbsm); |
431 | this.dzhbhData.djzqbsm = res.result.djzqbsm | 431 | this.dzhbhData.djzqbsm = res.result.djzqbsm; |
432 | this.dzhbhData.syqlxbsm = res.result.syqlxbsm | 432 | this.dzhbhData.syqlxbsm = res.result.syqlxbsm; |
433 | this.dzhbhData.zdtzmbsm = res.result.zdtzmbsm | 433 | this.dzhbhData.zdtzmbsm = res.result.zdtzmbsm; |
434 | }) | 434 | }) |
435 | }, | 435 | }, |
436 | newAddDz() { | 436 | newAddDz() { |
437 | this.dzIsVisible = true; | 437 | this.dzIsVisible = true; |
438 | this.reset(); | ||
438 | this.geDztData(this.queryData) | 439 | this.geDztData(this.queryData) |
439 | }, | 440 | }, |
440 | newAddZrz() { | 441 | newAddZrz() { |
441 | this.zrzIsVisible = true; | 442 | this.zrzIsVisible = true; |
443 | this.reset(); | ||
442 | this.geZrztData(this.queryData) | 444 | this.geZrztData(this.queryData) |
443 | }, | 445 | }, |
444 | deleteData(index) { | 446 | deleteData(index) { |
445 | console.log(JSON.stringify(index)+":row") | ||
446 | let data = this.dzhbqData[index]; | 447 | let data = this.dzhbqData[index]; |
447 | // 多幢 | 448 | // 多幢 |
448 | if (data.zrzCount) { | 449 | if (data.zrzCount) { |
... | @@ -453,17 +454,17 @@ | ... | @@ -453,17 +454,17 @@ |
453 | let zrzIndex = this.zrzList.indexOf(data); | 454 | let zrzIndex = this.zrzList.indexOf(data); |
454 | this.zrzList.splice(zrzIndex, 1) | 455 | this.zrzList.splice(zrzIndex, 1) |
455 | } | 456 | } |
456 | this.dzhbqData.splice(index, 1) | 457 | this.dzhbqData.splice(index, 1); |
457 | if (this.dzhbqData.length === 0) { | 458 | if (this.dzhbqData.length === 0) { |
458 | this.dzhbhData.xzqbsm = "" | 459 | this.dzhbhData.xzqbsm = ""; |
459 | this.dzhbhData.djqbsm = "" | 460 | this.dzhbhData.djqbsm = ""; |
460 | this.dzhbhData.djzqbsm = "" | 461 | this.dzhbhData.djzqbsm = ""; |
461 | this.dzhbhData.syqlxbsm = "" | 462 | this.dzhbhData.syqlxbsm = ""; |
462 | this.dzhbhData.zdtzmbsm = "" | 463 | this.dzhbhData.zdtzmbsm = "" |
463 | } | 464 | } |
464 | }, | 465 | }, |
465 | save() { | 466 | save() { |
466 | 467 | ||
467 | }, | 468 | }, |
468 | dzClose() { | 469 | dzClose() { |
469 | this.dzIsVisible = false; | 470 | this.dzIsVisible = false; |
... | @@ -473,22 +474,30 @@ | ... | @@ -473,22 +474,30 @@ |
473 | }, | 474 | }, |
474 | currentChange(val) { | 475 | currentChange(val) { |
475 | this.queryData.pageNo = val; | 476 | this.queryData.pageNo = val; |
476 | this.geDztData(this.queryData); | 477 | if (this.dzIsVisible) { |
478 | this.geDztData(this.queryData); | ||
479 | }else { | ||
480 | this.geZrztData(this.queryData) | ||
481 | } | ||
477 | }, | 482 | }, |
478 | geDztData(data) { | 483 | geDztData(data) { |
479 | dzList(data).then(res => { | 484 | dzList(data).then(res => { |
480 | this.Data = res.result.records | 485 | this.Data = res.result.records; |
481 | this.total = res.result.total; | 486 | this.total = res.result.total; |
482 | }) | 487 | }) |
483 | }, | 488 | }, |
484 | geZrztData(data) { | 489 | geZrztData(data) { |
485 | zrzList(data).then(res => { | 490 | zrzList(data).then(res => { |
486 | this.Data = res.result.records | 491 | this.Data = res.result.records; |
487 | this.total = res.result.total; | 492 | this.total = res.result.total; |
488 | }) | 493 | }) |
489 | }, | 494 | }, |
490 | search() { | 495 | search() { |
491 | this.geDztData(this.queryData) | 496 | if (this.dzIsVisible) { |
497 | this.geDztData(this.queryData); | ||
498 | }else { | ||
499 | this.geZrztData(this.queryData) | ||
500 | } | ||
492 | }, | 501 | }, |
493 | addData(data) { | 502 | addData(data) { |
494 | if (this.dzhbqData.length === 0) { | 503 | if (this.dzhbqData.length === 0) { |
... | @@ -502,7 +511,7 @@ | ... | @@ -502,7 +511,7 @@ |
502 | let arr = []; | 511 | let arr = []; |
503 | arr = this.dzhbqData.filter(i => i.bsm === data.bsm); | 512 | arr = this.dzhbqData.filter(i => i.bsm === data.bsm); |
504 | if (arr.length > 0) { | 513 | if (arr.length > 0) { |
505 | this.$message.info("当前多幢已选择,请重新选择") | 514 | this.$message.info("当前多幢已选择,请重新选择"); |
506 | return | 515 | return |
507 | } | 516 | } |
508 | arr = this.dzhbqData.filter(i => i.zdbsm !== data.zdbsm); | 517 | arr = this.dzhbqData.filter(i => i.zdbsm !== data.zdbsm); |
... | @@ -610,19 +619,23 @@ | ... | @@ -610,19 +619,23 @@ |
610 | pageNo: 1, | 619 | pageNo: 1, |
611 | pageSize: 10 | 620 | pageSize: 10 |
612 | }; | 621 | }; |
613 | this.geDztData(this.queryData) | 622 | if (this.dzIsVisible) { |
623 | this.geDztData(this.queryData); | ||
624 | }else { | ||
625 | this.geZrztData(this.queryData) | ||
626 | } | ||
614 | }, | 627 | }, |
615 | }, | 628 | }, |
616 | watch: { | 629 | watch: { |
617 | zdbsm: function (bsm) { | 630 | zdbsm: function (bsm) { |
618 | this.getZdData(bsm) | 631 | this.getZdData(bsm) |
619 | } | 632 | }, |
620 | } | 633 | } |
621 | } | 634 | } |
622 | </script> | 635 | </script> |
623 | 636 | ||
624 | <style scoped lang="less"> | 637 | <style scoped lang="less"> |
625 | 638 | ||
626 | .psn { | 639 | .psn { |
627 | position: unset !important; | 640 | position: unset !important; |
628 | } | 641 | } |
... | @@ -652,6 +665,7 @@ | ... | @@ -652,6 +665,7 @@ |
652 | } | 665 | } |
653 | 666 | ||
654 | .header-button { | 667 | .header-button { |
668 | z-index: 3; | ||
655 | width: 1624px; | 669 | width: 1624px; |
656 | height: 50px; | 670 | height: 50px; |
657 | position: fixed; | 671 | position: fixed; | ... | ... |
... | @@ -56,17 +56,18 @@ | ... | @@ -56,17 +56,18 @@ |
56 | <div class="table-bode"> | 56 | <div class="table-bode"> |
57 | <table border="1"> | 57 | <table border="1"> |
58 | <tr> | 58 | <tr> |
59 | <td>序号</td> | 59 | <th>序号</th> |
60 | <td>操作</td> | 60 | <th>操作</th> |
61 | <td>宗地代码</td> | 61 | <th>宗地代码</th> |
62 | <td>不动产单元号</td> | 62 | <th>不动产单元号</th> |
63 | <td>项目名称</td> | 63 | <th>项目名称</th> |
64 | <td>不动产权证号</td> | 64 | <th>不动产权证号</th> |
65 | <td>权利人</td> | 65 | <th>权利人</th> |
66 | <td>坐落</td> | 66 | <th>坐落</th> |
67 | <th>自然幢数量</th> | ||
67 | </tr> | 68 | </tr> |
68 | <tr v-if="Data.length==0"> | 69 | <tr v-if="Data.length===0"> |
69 | <td colspan="8"> | 70 | <td colspan="9"> |
70 | <span class="noData">暂无数据</span> | 71 | <span class="noData">暂无数据</span> |
71 | </td> | 72 | </td> |
72 | </tr> | 73 | </tr> |
... | @@ -79,8 +80,9 @@ | ... | @@ -79,8 +80,9 @@ |
79 | <td>{{item.bdcdyh}}</td> | 80 | <td>{{item.bdcdyh}}</td> |
80 | <td>{{item.xmmc}}</td> | 81 | <td>{{item.xmmc}}</td> |
81 | <td>{{item.bdcqzh}}</td> | 82 | <td>{{item.bdcqzh}}</td> |
82 | <td>{{item.qlr}}</td> | 83 | <td>{{item.qlrmc}}</td> |
83 | <td>{{item.zl}}</td> | 84 | <td>{{item.zl}}</td> |
85 | <td>{{item.zrzCount}}</td> | ||
84 | </tr> | 86 | </tr> |
85 | </table> | 87 | </table> |
86 | </div> | 88 | </div> |
... | @@ -208,7 +210,9 @@ | ... | @@ -208,7 +210,9 @@ |
208 | background-color: #F5F7FA; | 210 | background-color: #F5F7FA; |
209 | } | 211 | } |
210 | } | 212 | } |
211 | 213 | th{ | |
214 | height: 36px; | ||
215 | } | ||
212 | td { | 216 | td { |
213 | text-align: center; | 217 | text-align: center; |
214 | height: 36px; | 218 | height: 36px; | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -53,8 +53,8 @@ | ... | @@ -53,8 +53,8 @@ |
53 | :class="childIndex > 0 ? 'childYT' : ''" | 53 | :class="childIndex > 0 ? 'childYT' : ''" |
54 | > | 54 | > |
55 | <ul> | 55 | <ul> |
56 | <li>批准用途</li> | 56 | <li><i class="requisite">*</i>批准用途</li> |
57 | <li>实际用途</li> | 57 | <li><i class="requisite">*</i>实际用途</li> |
58 | <li><i class="requisite">*</i>土地使用起始时间</li> | 58 | <li><i class="requisite">*</i>土地使用起始时间</li> |
59 | </ul> | 59 | </ul> |
60 | </el-col> | 60 | </el-col> |
... | @@ -69,6 +69,7 @@ | ... | @@ -69,6 +69,7 @@ |
69 | class="formSelect percent30" | 69 | class="formSelect percent30" |
70 | v-if="show" | 70 | v-if="show" |
71 | :default-expand-all="defaultExpandAll" | 71 | :default-expand-all="defaultExpandAll" |
72 | ref="pzytdm" | ||
72 | :multiple="multiple" | 73 | :multiple="multiple" |
73 | :placeholder="placeholder" | 74 | :placeholder="placeholder" |
74 | :disabled="formData.qszt!='0'" | 75 | :disabled="formData.qszt!='0'" |
... | @@ -84,6 +85,7 @@ | ... | @@ -84,6 +85,7 @@ |
84 | class="formSelect percent30" | 85 | class="formSelect percent30" |
85 | v-if="show" | 86 | v-if="show" |
86 | :default-expand-all="defaultExpandAll" | 87 | :default-expand-all="defaultExpandAll" |
88 | ref="sjytdm" | ||
87 | :multiple="multiple" | 89 | :multiple="multiple" |
88 | :placeholder="placeholder" | 90 | :placeholder="placeholder" |
89 | :disabled="formData.qszt!='0'" | 91 | :disabled="formData.qszt!='0'" |
... | @@ -234,8 +236,8 @@ | ... | @@ -234,8 +236,8 @@ |
234 | :class="childIndex > 0 ? 'childYT' : ''" | 236 | :class="childIndex > 0 ? 'childYT' : ''" |
235 | > | 237 | > |
236 | <ul> | 238 | <ul> |
237 | <li>批准用途</li> | 239 | <li><i class="requisite">*</i>批准用途</li> |
238 | <li>实际用途</li> | 240 | <li><i class="requisite">*</i>实际用途</li> |
239 | <li><i class="requisite">*</i>土地使用起始时间</li> | 241 | <li><i class="requisite">*</i>土地使用起始时间</li> |
240 | </ul> | 242 | </ul> |
241 | </el-col> | 243 | </el-col> |
... | @@ -249,6 +251,7 @@ | ... | @@ -249,6 +251,7 @@ |
249 | <el-select-tree | 251 | <el-select-tree |
250 | v-if="show" | 252 | v-if="show" |
251 | :default-expand-all="defaultExpandAll" | 253 | :default-expand-all="defaultExpandAll" |
254 | ref="pzytdm" | ||
252 | :multiple="multiple" | 255 | :multiple="multiple" |
253 | :placeholder="placeholder" | 256 | :placeholder="placeholder" |
254 | :disabled="disabled" | 257 | :disabled="disabled" |
... | @@ -263,6 +266,7 @@ | ... | @@ -263,6 +266,7 @@ |
263 | <el-select-tree | 266 | <el-select-tree |
264 | v-if="show" | 267 | v-if="show" |
265 | :default-expand-all="defaultExpandAll" | 268 | :default-expand-all="defaultExpandAll" |
269 | ref="sjytdm" | ||
266 | :multiple="multiple" | 270 | :multiple="multiple" |
267 | :placeholder="placeholder" | 271 | :placeholder="placeholder" |
268 | :disabled="disabled" | 272 | :disabled="disabled" |
... | @@ -627,6 +631,20 @@ export default { | ... | @@ -627,6 +631,20 @@ export default { |
627 | // val:this.$refs.tdsyjssj[temp+ind].value, | 631 | // val:this.$refs.tdsyjssj[temp+ind].value, |
628 | rule: /^\s*$/g, //非空 | 632 | rule: /^\s*$/g, //非空 |
629 | }, | 633 | }, |
634 | { | ||
635 | data:item.list[ind].pzytdm, | ||
636 | name:'批准用途', | ||
637 | dom:this.$refs.pzytdm[temp+ind], | ||
638 | // val:this.$refs.tdsyjssj[temp+ind].value, | ||
639 | rule: /^\s*$/g, //非空 | ||
640 | }, | ||
641 | { | ||
642 | data:item.list[ind].sjytdm, | ||
643 | name:'实际用途', | ||
644 | dom:this.$refs.sjytdm[temp+ind], | ||
645 | // val:this.$refs.tdsyjssj[temp+ind].value, | ||
646 | rule: /^\s*$/g, //非空 | ||
647 | }, | ||
630 | ) | 648 | ) |
631 | if(this.hasSyqx){ | 649 | if(this.hasSyqx){ |
632 | rules.push( | 650 | rules.push( |
... | @@ -696,10 +714,18 @@ export default { | ... | @@ -696,10 +714,18 @@ export default { |
696 | watch:{ | 714 | watch:{ |
697 | countList: { | 715 | countList: { |
698 | handler : function (newVal, oldVal) { | 716 | handler : function (newVal, oldVal) { |
699 | newVal.forEach((item,ind)=>{ | 717 | newVal.forEach((i,ind)=>{ |
700 | if(item.qlxzdm != ''){ | 718 | i.list.forEach((item,index)=>{ |
701 | this.$refs.qlxzdm[ind].$el.style.border="" | 719 | if(item.qlxzdm != '' &&item.qlxzdm != null){ |
702 | } | 720 | this.$refs.qlxzdm[ind].$el.style.border="" |
721 | } | ||
722 | if(item.sjytdm != '' &&item.sjytdm != null){ | ||
723 | this.$refs.sjytdm[ind].$el.style.border="" | ||
724 | } | ||
725 | if(item.pzytdm != '' &&item.pzytdm != null){ | ||
726 | this.$refs.pzytdm[ind].$el.style.border="" | ||
727 | } | ||
728 | }) | ||
703 | }) | 729 | }) |
704 | }, | 730 | }, |
705 | deep:true | 731 | deep:true |
... | @@ -868,6 +894,9 @@ export default { | ... | @@ -868,6 +894,9 @@ export default { |
868 | margin-top: 16px; | 894 | margin-top: 16px; |
869 | } | 895 | } |
870 | } | 896 | } |
897 | .tdytAdd{ | ||
898 | width: 100px; | ||
899 | } | ||
871 | .tdytAdd,.tdytMinus{ | 900 | .tdytAdd,.tdytMinus{ |
872 | span{ | 901 | span{ |
873 | font-size: 14px; | 902 | font-size: 14px; | ... | ... |
src/components/fwsxbg/fwsxbgTab.vue
0 → 100644
This diff is collapsed.
Click to expand it.
... | @@ -62,9 +62,9 @@ | ... | @@ -62,9 +62,9 @@ |
62 | </div> | 62 | </div> |
63 | <div class="footer"> | 63 | <div class="footer"> |
64 | <el-button type="primary" @click="save">保存</el-button> | 64 | <el-button type="primary" @click="save">保存</el-button> |
65 | <el-button type="primary" @click="cancel">取消</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> |
... | @@ -160,9 +160,6 @@ | ... | @@ -160,9 +160,6 @@ |
160 | }; | 160 | }; |
161 | this.hcxlzData.bsms = this.bsms; | 161 | this.hcxlzData.bsms = this.bsms; |
162 | }, | 162 | }, |
163 | cancel() { | ||
164 | this.close(); | ||
165 | }, | ||
166 | save() { | 163 | save() { |
167 | if (this.hcxlzData.zrzbsm === '') { | 164 | if (this.hcxlzData.zrzbsm === '') { |
168 | Message.error("请选择自然幢"); | 165 | Message.error("请选择自然幢"); |
... | @@ -170,7 +167,14 @@ | ... | @@ -170,7 +167,14 @@ |
170 | } | 167 | } |
171 | hzl(this.hcxlzData).then(res => { | 168 | hzl(this.hcxlzData).then(res => { |
172 | if (res.success) { | 169 | if (res.success) { |
173 | this.close(); | 170 | this.$router.push({ |
171 | path:'zrz', | ||
172 | query: { | ||
173 | bsm:this.hcxlzData.zrzbsm, | ||
174 | source: 2, | ||
175 | auth: '0,1,2' | ||
176 | } | ||
177 | }) | ||
174 | } else { | 178 | } else { |
175 | Message.error(res.message) | 179 | Message.error(res.message) |
176 | } | 180 | } | ... | ... |
... | @@ -54,15 +54,20 @@ | ... | @@ -54,15 +54,20 @@ |
54 | :data-zdbsm="item.zdbsm" | 54 | :data-zdbsm="item.zdbsm" |
55 | :title=item.mc | 55 | :title=item.mc |
56 | > | 56 | > |
57 | <span class="qsztImg" v-if="item.qszt=='0'" style="background: #f79700; "> | 57 | <span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)" style="background: #9e9b9b"> |
58 | <span class="qsztFont">临</span> | 58 | <span class="qsztFont">变</span> |
59 | </span> | ||
60 | <span class="qsztImg" v-if="item.qszt=='1'" style="background:#00dd00; "> | ||
61 | <span class="qsztFont">正</span> | ||
62 | </span> | ||
63 | <span class="qsztImg" v-if="item.qszt=='2'" style="background: #238ff9; "> | ||
64 | <span class="qsztFont">现</span> | ||
65 | </span> | 59 | </span> |
60 | <template v-else> | ||
61 | <span class="qsztImg" v-if="item.qszt=='0'" style="background: #f79700; "> | ||
62 | <span class="qsztFont">临</span> | ||
63 | </span> | ||
64 | <span class="qsztImg" v-if="item.qszt=='1'" style="background:#00dd00; "> | ||
65 | <span class="qsztFont">正</span> | ||
66 | </span> | ||
67 | <span class="qsztImg" v-if="item.qszt=='2'" style="background: #238ff9; "> | ||
68 | <span class="qsztFont">现</span> | ||
69 | </span> | ||
70 | </template> | ||
66 | 71 | ||
67 | <!-- <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> | 72 | <!-- <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> |
68 | <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/> | 73 | <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/> |
... | @@ -248,8 +253,7 @@ export default { | ... | @@ -248,8 +253,7 @@ export default { |
248 | default: | 253 | default: |
249 | break; | 254 | break; |
250 | } | 255 | } |
251 | 256 | if(item.type == 'zd' ||item.type == 'dz' ||item.type == 'zrz'||item.type == 'gzw'){ | |
252 | if(item.type){ | ||
253 | this.$router.push({ | 257 | this.$router.push({ |
254 | path: '/'+item.type, | 258 | path: '/'+item.type, |
255 | query:{ | 259 | query:{ | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | <el-dialog v-dialogDrag :close-on-click-modal="false" | 3 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
4 | title="新增" | 4 | title="批量户" |
5 | :visible.sync="isVisible" | 5 | :visible.sync="isVisible" |
6 | width="70%" | 6 | width="72%" |
7 | @close="close" | 7 | @close="close" |
8 | :modal-append-to-body="false" | 8 | :modal-append-to-body="false" |
9 | > | 9 | > |
... | @@ -25,7 +25,7 @@ | ... | @@ -25,7 +25,7 @@ |
25 | <td colspan="2">其他建筑面积(㎡)</td> | 25 | <td colspan="2">其他建筑面积(㎡)</td> |
26 | <td colspan="4"><input type="text" v-model="form.qtjzmj" class="inputtitle"/></td> | 26 | <td colspan="4"><input type="text" v-model="form.qtjzmj" class="inputtitle"/></td> |
27 | <td colspan="2">分摊系数</td> | 27 | <td colspan="2">分摊系数</td> |
28 | <td colspan="4"><input type="text" v-model="form.ftxs" class="inputtitle"/></td> | 28 | <td colspan="4"><input type="number" @blur="inputBlur($event)" ref="ftxs" v-model="form.ftxs" class="inputtitle"/></td> |
29 | </tr> | 29 | </tr> |
30 | <tr> | 30 | <tr> |
31 | <td colspan="2">户型</td> | 31 | <td colspan="2">户型</td> |
... | @@ -116,11 +116,11 @@ | ... | @@ -116,11 +116,11 @@ |
116 | <td colspan="5"> | 116 | <td colspan="5"> |
117 | <el-select class="selectTitle" v-model="form.fwjgbsm"> | 117 | <el-select class="selectTitle" v-model="form.fwjgbsm"> |
118 | <el-option | 118 | <el-option |
119 | v-for="i in $store.state.fwjgList" | 119 | v-for="item in $store.state.jgOptions" |
120 | :key="i.bsm" | 120 | :key="item.bsm" |
121 | :label="i.mc" | 121 | :label="item.mc" |
122 | :value="i.bsm" | 122 | :value="item.bsm"> |
123 | ></el-option> | 123 | </el-option> |
124 | </el-select> | 124 | </el-select> |
125 | </td> | 125 | </td> |
126 | </tr> | 126 | </tr> |
... | @@ -177,23 +177,20 @@ | ... | @@ -177,23 +177,20 @@ |
177 | <td colspan="9" > | 177 | <td colspan="9" > |
178 | <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > | 178 | <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > |
179 | <el-option | 179 | <el-option |
180 | v-for="item in $store.state.fwjgList" | 180 | v-for="item in $store.state.jgOptions" |
181 | :key="item.bsm" | 181 | :key="item.bsm" |
182 | :label="item.mc" | 182 | :label="item.mc" |
183 | :value="item.bsm"> | 183 | :value="item.bsm"> |
184 | </el-option> | 184 | </el-option> |
185 | </el-select> | 185 | </el-select> |
186 | </td> | 186 | </td> |
187 | </tr> | 187 | </tr> |
188 | 188 | ||
189 | <tr> | 189 | <tr> |
190 | <td colspan="12" rowspan="4" align="center"> | 190 | <td colspan="12" align="center"> |
191 | <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> | 191 | <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> |
192 | </td> | 192 | </td> |
193 | </tr> | 193 | </tr> |
194 | <tr></tr> | ||
195 | <tr></tr> | ||
196 | <tr></tr> | ||
197 | 194 | ||
198 | <tr> | 195 | <tr> |
199 | <td colspan="2">东墙体归属</td> | 196 | <td colspan="2">东墙体归属</td> |
... | @@ -315,6 +312,16 @@ | ... | @@ -315,6 +312,16 @@ |
315 | } | 312 | } |
316 | }, | 313 | }, |
317 | methods: { | 314 | methods: { |
315 | |||
316 | inputBlur(e){ | ||
317 | if(e.target.value!==''&&+e.target.value>0&&+e.target.value<10){ | ||
318 | e.target.style.border="" | ||
319 | }else{ | ||
320 | e.target.style.border="1px solid red"; | ||
321 | e.target.style.boxSizing = 'border-box'; | ||
322 | } | ||
323 | }, | ||
324 | |||
318 | lodding:function(){ | 325 | lodding:function(){ |
319 | this.$emit('lodding') | 326 | this.$emit('lodding') |
320 | }, | 327 | }, |
... | @@ -360,7 +367,7 @@ | ... | @@ -360,7 +367,7 @@ |
360 | close: function () { | 367 | close: function () { |
361 | this.$emit('close') | 368 | this.$emit('close') |
362 | this.isVisible = false | 369 | this.isVisible = false |
363 | this.result() | 370 | this.reset() |
364 | }, | 371 | }, |
365 | reset: function () { | 372 | reset: function () { |
366 | this.form={ | 373 | this.form={ |
... | @@ -411,33 +418,69 @@ | ... | @@ -411,33 +418,69 @@ |
411 | this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量 | 418 | this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量 |
412 | }, | 419 | }, |
413 | save: function () { | 420 | save: function () { |
421 | |||
422 | this.rules=[ | ||
423 | { | ||
424 | data:this.form.ftxs, | ||
425 | name:'分摊系数', | ||
426 | dom:this.$refs.ftxs, | ||
427 | rule:/^(?!0(\.0{1,2})?$)(\d(\.\d{1,2})?)$/, //大于0小于10的所有保留两位的数字 | ||
428 | }, | ||
429 | ]; | ||
430 | let flag = true; | ||
431 | this.rules.forEach(item=>{ | ||
432 | if(item.data !==""){ | ||
433 | if(!item.rule.test(+item.data) || item.data == null){ | ||
434 | if(item.dom.$el){ | ||
435 | item.dom.$el.style.border = '1px solid red'; | ||
436 | item.dom.$el.style.boxSizing = 'border-box'; | ||
437 | }else{ | ||
438 | item.dom.style.border = '1px solid red'; | ||
439 | item.dom.style.boxSizing = 'border-box'; | ||
440 | } | ||
441 | flag = false; | ||
442 | return false | ||
443 | } | ||
444 | } | ||
445 | }) | ||
446 | |||
414 | this.form['hbsms'] = this.bsms | 447 | this.form['hbsms'] = this.bsms |
415 | this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); | 448 | this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); |
416 | for(let i=0;i< this.form.fwjgList.length;i++){ | 449 | this.$nextTick(()=> { |
417 | if(this.form.fwjgList[i].fwjgzdbsm===''){ | 450 | if (flag) { |
418 | this.form.fwjgList.splice(i,1); | 451 | for(let i=0;i< this.form.fwjgList.length;i++){ |
419 | } | 452 | if(this.form.fwjgList[i].fwjgzdbsm===''){ |
420 | } | 453 | this.form.fwjgList.splice(i,1); |
421 | for(let i=0;i< this.form.fwytList.length;i++){ | 454 | } |
422 | if(this.form.fwytList[i].fwsjytbsm===''){ | 455 | } |
423 | this.form.fwytList.splice(i,1); | 456 | for(let i=0;i< this.form.fwytList.length;i++){ |
424 | } | 457 | if(this.form.fwytList[i].fwsjytbsm===''){ |
425 | } | 458 | this.form.fwytList.splice(i,1); |
426 | for(let i=0;i< this.form.qlxzList.length;i++){ | 459 | } |
427 | if(this.form.qlxzList[i].qlxzdm===''){ | 460 | } |
428 | this.form.qlxzList.splice(i,1); | 461 | for(let i=0;i< this.form.qlxzList.length;i++){ |
429 | } | 462 | if(this.form.qlxzList[i].qlxzdm===''){ |
430 | } | 463 | this.form.qlxzList.splice(i,1); |
431 | console.log("批量户信息") | 464 | } |
432 | console.log(this.form) | 465 | } |
433 | batchUpdateQjH(this.form).then((res)=>{ | 466 | console.log("批量户信息") |
434 | if(res.code===200){ | 467 | console.log(this.form) |
435 | this.lodding() | 468 | batchUpdateQjH(this.form).then((res)=>{ |
436 | this.$message.success("保存成功!") | 469 | if(res.code===200){ |
437 | this.$nextTick(()=>{ | 470 | this.lodding() |
438 | this.reset(); | 471 | this.$message.success("保存成功!") |
472 | this.$nextTick(()=>{ | ||
473 | this.reset(); | ||
474 | }) | ||
475 | this.close(); | ||
476 | } | ||
439 | }) | 477 | }) |
440 | this.close(); | 478 | }else{ |
479 | this.$message({ | ||
480 | // message: item.name+'不能为空', | ||
481 | message: '表单数据有误', | ||
482 | type: "warning", | ||
483 | }); | ||
441 | } | 484 | } |
442 | }) | 485 | }) |
443 | }, | 486 | }, | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | <el-dialog v-dialogDrag :close-on-click-modal="false" | 3 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
4 | title="批量坐落" | 4 | title="批量坐落" |
5 | :visible.sync="isVisible" | 5 | :visible.sync="isVisible" |
6 | width="60%" | 6 | width="60%" |
7 | @close="close" | 7 | @close="close" |
8 | :modal-append-to-body="false" | 8 | :modal-append-to-body="false" |
9 | > | 9 | > |
10 | <div> | 10 | <div> |
11 | <table border="1"> | 11 | <table border="1"> |
12 | <tr> | 12 | <tr> |
13 | <td>前缀</td> | 13 | <th>前缀</th> |
14 | <td>宗地</td> | 14 | <th>宗地</th> |
15 | <td>自然幢</td> | 15 | <th>自然幢</th> |
16 | <td>逻辑幢</td> | 16 | <th>逻辑幢</th> |
17 | <td>幢单元</td> | 17 | <th>幢单元</th> |
18 | <td>层</td> | 18 | <th>层</th> |
19 | <td>户</td> | 19 | <th>户</th> |
20 | <td>后缀</td> | 20 | <th>后缀</th> |
21 | </tr> | 21 | </tr> |
22 | <tr> | 22 | <tr> |
23 | <td> | 23 | <td> |
24 | <input type="text" class="inputtitle" v-model="plzlData.qz"/> | 24 | <el-input v-model="plzlData.qz"></el-input> |
25 | </td> | 25 | </td> |
26 | <td> | 26 | <td> |
27 | <el-select v-model="plzlData.zd"> | 27 | <el-select v-model="plzlData.zd"> |
28 | <el-option v-for="i in zdgz" | 28 | <el-option v-for="i in zdgz" |
29 | :key="i.label" | 29 | :key="i.label" |
30 | :label="i.label" | 30 | :label="i.label" |
31 | :value="i.value"> | 31 | :value="i.value" |
32 | 32 | :disabled="i.disabled"> | |
33 | </el-option> | 33 | </el-option> |
34 | </el-select> | 34 | </el-select> |
35 | </td> | 35 | </td> |
... | @@ -38,8 +38,8 @@ | ... | @@ -38,8 +38,8 @@ |
38 | <el-option v-for="i in zrzgz" | 38 | <el-option v-for="i in zrzgz" |
39 | :key="i.label" | 39 | :key="i.label" |
40 | :label="i.label" | 40 | :label="i.label" |
41 | :value="i.value"> | 41 | :value="i.value" |
42 | 42 | :disabled="i.disabled"> | |
43 | </el-option> | 43 | </el-option> |
44 | </el-select> | 44 | </el-select> |
45 | </td> | 45 | </td> |
... | @@ -84,7 +84,7 @@ | ... | @@ -84,7 +84,7 @@ |
84 | </el-select> | 84 | </el-select> |
85 | </td> | 85 | </td> |
86 | <td> | 86 | <td> |
87 | <input type="text" class="inputtitle" v-model="plzlData.hz"/> | 87 | <el-input v-model="plzlData.hz"></el-input> |
88 | </td> | 88 | </td> |
89 | </tr> | 89 | </tr> |
90 | </table> | 90 | </table> |
... | @@ -132,22 +132,27 @@ | ... | @@ -132,22 +132,27 @@ |
132 | zdgz: [ | 132 | zdgz: [ |
133 | { | 133 | { |
134 | label: '宗地坐落', | 134 | label: '宗地坐落', |
135 | value: '1' | 135 | value: '1', |
136 | disabled: false | ||
136 | }, { | 137 | }, { |
137 | label: "宗地名称", | 138 | label: "宗地名称", |
138 | value: '2' | 139 | value: '2', |
140 | disabled: false | ||
139 | }, { | 141 | }, { |
140 | label: "空", | 142 | label: "空", |
141 | value: '3' | 143 | value: '3', |
144 | disabled: false | ||
142 | } | 145 | } |
143 | ], | 146 | ], |
144 | zrzgz: [ | 147 | zrzgz: [ |
145 | { | 148 | { |
146 | label: '自然幢坐落', | 149 | label: '自然幢坐落', |
147 | value: '1' | 150 | value: '1', |
151 | disabled: false | ||
148 | }, { | 152 | }, { |
149 | label: "自然幢名称", | 153 | label: "自然幢名称", |
150 | value: '2' | 154 | value: '2', |
155 | disabled: false | ||
151 | }, { | 156 | }, { |
152 | label: "空", | 157 | label: "空", |
153 | value: '3' | 158 | value: '3' |
... | @@ -229,7 +234,7 @@ | ... | @@ -229,7 +234,7 @@ |
229 | test: function () { | 234 | test: function () { |
230 | for (let key in this.plzlData) { | 235 | for (let key in this.plzlData) { |
231 | if (this.plzlData[key] !== '' && this.plzlData[key] !== '3') { | 236 | if (this.plzlData[key] !== '' && this.plzlData[key] !== '3') { |
232 | return true; | 237 | return true; |
233 | } | 238 | } |
234 | } | 239 | } |
235 | return false; | 240 | return false; |
... | @@ -305,6 +310,13 @@ | ... | @@ -305,6 +310,13 @@ |
305 | watch: { | 310 | watch: { |
306 | plZlVisible: function (val) { | 311 | plZlVisible: function (val) { |
307 | this.isVisible = val | 312 | this.isVisible = val |
313 | }, | ||
314 | plzlData: { | ||
315 | handler(val) { | ||
316 | this.zrzgz[0].disabled = +val.zd === 1; | ||
317 | this.zdgz[0].disabled = +val.zrz === 1; | ||
318 | }, | ||
319 | deep: true | ||
308 | } | 320 | } |
309 | } | 321 | } |
310 | } | 322 | } |
... | @@ -321,6 +333,10 @@ | ... | @@ -321,6 +333,10 @@ |
321 | } | 333 | } |
322 | } | 334 | } |
323 | 335 | ||
336 | th { | ||
337 | height: 36px; | ||
338 | } | ||
339 | |||
324 | td { | 340 | td { |
325 | text-align: center; | 341 | text-align: center; |
326 | height: 36px; | 342 | height: 36px; | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | <el-row class="box"> | 2 | <el-row class="box"> |
3 | <el-col :span="24"> | 3 | <el-col :span="24"> |
4 | <el-row> | 4 | <el-row> |
5 | <el-col :span="24"> | 5 | <el-col :span="18"> |
6 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> | 6 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> |
7 | <el-form-item label="宗地编码"> | 7 | <el-form-item label="宗地编码"> |
8 | <el-input | 8 | <el-input |
... | @@ -18,14 +18,17 @@ | ... | @@ -18,14 +18,17 @@ |
18 | @change="query" | 18 | @change="query" |
19 | ></el-input> | 19 | ></el-input> |
20 | </el-form-item> | 20 | </el-form-item> |
21 | <el-form-item label="不动产单元号"> | 21 | <el-form-item label="不动产单元号" > |
22 | <el-input | 22 | <el-input style="width: 280px;" |
23 | maxlength="28" | 23 | maxlength="28" |
24 | v-model="queryData.bdcdyh" | 24 | v-model="queryData.bdcdyh" |
25 | placeholder="输入不动产单元号" | 25 | placeholder="输入不动产单元号" |
26 | @change="query" | 26 | @change="query" |
27 | ></el-input> | 27 | ></el-input> |
28 | </el-form-item> | 28 | </el-form-item> |
29 | </el-form> | ||
30 | </el-col> | ||
31 | <el-col :span="6" aria-rowspan="3"> | ||
29 | <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button> | 32 | <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button> |
30 | <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button> | 33 | <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button> |
31 | <el-button | 34 | <el-button |
... | @@ -34,11 +37,10 @@ | ... | @@ -34,11 +37,10 @@ |
34 | >更多查询 | 37 | >更多查询 |
35 | </el-button> | 38 | </el-button> |
36 | <!-- @click="ismore = !ismore" --> | 39 | <!-- @click="ismore = !ismore" --> |
37 | </el-form> | ||
38 | </el-col> | 40 | </el-col> |
39 | </el-row> | 41 | </el-row> |
40 | <el-row class="row3" v-if="ismore"> | 42 | <el-row class="row3" v-if="ismore"> |
41 | <el-col :span="22"> | 43 | <el-col :span="18"> |
42 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> | 44 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> |
43 | <el-form-item label="权利人名称"> | 45 | <el-form-item label="权利人名称"> |
44 | <el-input | 46 | <el-input |
... | @@ -55,7 +57,7 @@ | ... | @@ -55,7 +57,7 @@ |
55 | ></el-input> | 57 | ></el-input> |
56 | </el-form-item> | 58 | </el-form-item> |
57 | <el-form-item label="不动产权证号"> | 59 | <el-form-item label="不动产权证号"> |
58 | <el-input | 60 | <el-input style="width: 280px;" |
59 | placeholder="输入不动产权证号" | 61 | placeholder="输入不动产权证号" |
60 | v-model="queryData.bdcqzh" | 62 | v-model="queryData.bdcqzh" |
61 | @change="query" | 63 | @change="query" |
... | @@ -63,11 +65,11 @@ | ... | @@ -63,11 +65,11 @@ |
63 | </el-form-item> | 65 | </el-form-item> |
64 | </el-form> | 66 | </el-form> |
65 | </el-col> | 67 | </el-col> |
66 | <el-col :span="2" :offset="offset"> | 68 | <!-- <el-col :span="2" :offset="offset"> |
67 | </el-col> | 69 | </el-col> --> |
68 | </el-row> | 70 | </el-row> |
69 | <el-row> | 71 | <el-row> |
70 | <el-col :span="24"> | 72 | <el-col :span="18"> |
71 | <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px"> | 73 | <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px"> |
72 | <el-form-item class="demo-form-inline" label="单元范围"> | 74 | <el-form-item class="demo-form-inline" label="单元范围"> |
73 | <el-checkbox-group v-model="queryData.dylxs" @change="query"> | 75 | <el-checkbox-group v-model="queryData.dylxs" @change="query"> |
... | @@ -83,8 +85,6 @@ | ... | @@ -83,8 +85,6 @@ |
83 | </el-form-item> | 85 | </el-form-item> |
84 | </el-form> | 86 | </el-form> |
85 | </el-col> | 87 | </el-col> |
86 | <el-col :span="2"> | ||
87 | </el-col> | ||
88 | </el-row> | 88 | </el-row> |
89 | </el-col> | 89 | </el-col> |
90 | </el-row> | 90 | </el-row> | ... | ... |
... | @@ -56,17 +56,18 @@ | ... | @@ -56,17 +56,18 @@ |
56 | <div class="table-bode"> | 56 | <div class="table-bode"> |
57 | <table border="1"> | 57 | <table border="1"> |
58 | <tr> | 58 | <tr> |
59 | <td>序号</td> | 59 | <th>序号</th> |
60 | <td>操作</td> | 60 | <th>操作</th> |
61 | <td>宗地代码</td> | 61 | <th>宗地代码</th> |
62 | <td>不动产单元号</td> | 62 | <th>不动产单元号</th> |
63 | <td>项目名称</td> | 63 | <th>项目名称</th> |
64 | <td>不动产权证号</td> | 64 | <th>不动产权证号</th> |
65 | <td>权利人</td> | 65 | <th>权利人</th> |
66 | <td>坐落</td> | 66 | <th>坐落</th> |
67 | <th v-if="isCxlz">自然幢数量</th> | ||
67 | </tr> | 68 | </tr> |
68 | <tr v-if="Data.length===0"> | 69 | <tr v-if="Data.length===0"> |
69 | <td colspan="8"> | 70 | <td :colspan="isCxlz ? 9:8"> |
70 | <span class="noData">暂无数据</span> | 71 | <span class="noData">暂无数据</span> |
71 | </td> | 72 | </td> |
72 | </tr> | 73 | </tr> |
... | @@ -79,8 +80,9 @@ | ... | @@ -79,8 +80,9 @@ |
79 | <td>{{item.bdcdyh}}</td> | 80 | <td>{{item.bdcdyh}}</td> |
80 | <td>{{item.xmmc}}</td> | 81 | <td>{{item.xmmc}}</td> |
81 | <td>{{item.bdcqzh}}</td> | 82 | <td>{{item.bdcqzh}}</td> |
82 | <td>{{item.qlr}}</td> | 83 | <td>{{item.qlrmc}}</td> |
83 | <td>{{item.zl}}</td> | 84 | <td>{{item.zl}}</td> |
85 | <td v-if="isCxlz">{{item.zrzCount}}</td> | ||
84 | </tr> | 86 | </tr> |
85 | </table> | 87 | </table> |
86 | </div> | 88 | </div> |
... | @@ -132,6 +134,10 @@ | ... | @@ -132,6 +134,10 @@ |
132 | isZdClose: { | 134 | isZdClose: { |
133 | type: Boolean, | 135 | type: Boolean, |
134 | default: false | 136 | default: false |
137 | }, | ||
138 | isCxlz:{ | ||
139 | type: Boolean, | ||
140 | default: false | ||
135 | } | 141 | } |
136 | }, | 142 | }, |
137 | mounted() { | 143 | mounted() { |
... | @@ -167,7 +173,11 @@ | ... | @@ -167,7 +173,11 @@ |
167 | this.getData(this.queryData) | 173 | this.getData(this.queryData) |
168 | }, | 174 | }, |
169 | addData: function (val) { | 175 | addData: function (val) { |
170 | this.$emit("getData",val) | 176 | if (this.isCxlz &&val.zrzCount < 1) { |
177 | this.$message.warning("当前宗地下没有自然幢,请重新选择") | ||
178 | return | ||
179 | } | ||
180 | this.$emit("getData",val); | ||
171 | }, | 181 | }, |
172 | isClose(flag){ | 182 | isClose(flag){ |
173 | 183 | ||
... | @@ -208,7 +218,9 @@ | ... | @@ -208,7 +218,9 @@ |
208 | background-color: #F5F7FA; | 218 | background-color: #F5F7FA; |
209 | } | 219 | } |
210 | } | 220 | } |
211 | 221 | th{ | |
222 | height: 36px; | ||
223 | } | ||
212 | td { | 224 | td { |
213 | text-align: center; | 225 | text-align: center; |
214 | height: 36px; | 226 | height: 36px; | ... | ... |
... | @@ -453,7 +453,7 @@ export default { | ... | @@ -453,7 +453,7 @@ export default { |
453 | cursor: pointer; | 453 | cursor: pointer; |
454 | height: 72px; | 454 | height: 72px; |
455 | padding: 0 30px; | 455 | padding: 0 30px; |
456 | font-size: 20px; | 456 | font-size: 18px; |
457 | line-height: 72px; | 457 | line-height: 72px; |
458 | float: left; | 458 | float: left; |
459 | position: relative; | 459 | position: relative; |
... | @@ -462,7 +462,7 @@ export default { | ... | @@ -462,7 +462,7 @@ export default { |
462 | /*border-right: 1px solid #EAEAEA;*/ | 462 | /*border-right: 1px solid #EAEAEA;*/ |
463 | i { | 463 | i { |
464 | margin-right: 6px; | 464 | margin-right: 6px; |
465 | font-size: 22px; | 465 | font-size: 18px; |
466 | position: relative; | 466 | position: relative; |
467 | top: 1px; | 467 | top: 1px; |
468 | } | 468 | } | ... | ... |
This diff is collapsed.
Click to expand it.
1 | <template> | 1 | <template> |
2 | <div class="content_box"> | 2 | <div class="content_box"> |
3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> | 3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > |
4 | <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> | 4 | <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> |
5 | <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane> | 5 | <el-tab-pane label="附件材料" name="fjcl"> |
6 | <fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane> | ||
6 | </el-tabs> | 7 | </el-tabs> |
7 | </div> | 8 | </div> |
8 | </template> | 9 | </template> |
... | @@ -10,6 +11,7 @@ | ... | @@ -10,6 +11,7 @@ |
10 | <script> | 11 | <script> |
11 | import dzxx from "./dzxx"; | 12 | import dzxx from "./dzxx"; |
12 | import fjcl from "./../zd/fjcl/fjcl" | 13 | import fjcl from "./../zd/fjcl/fjcl" |
14 | import {queryStatus} from "@api/search" | ||
13 | export default { | 15 | export default { |
14 | name: "", | 16 | name: "", |
15 | components: { | 17 | components: { |
... | @@ -18,13 +20,24 @@ | ... | @@ -18,13 +20,24 @@ |
18 | props: {}, | 20 | props: {}, |
19 | data() { | 21 | data() { |
20 | return { | 22 | return { |
23 | isDisabled:false, | ||
21 | activeName: "dzxx", | 24 | activeName: "dzxx", |
22 | dzJbxxVisble:true, | 25 | dzJbxxVisble:true, |
23 | fjclVisible:false | 26 | fjclVisible:false |
24 | }; | 27 | }; |
25 | }, | 28 | }, |
26 | methods: { | 29 | methods: { |
30 | loadingStatus() { | ||
31 | let bsm=this.$store.state.dzbsm; | ||
32 | queryStatus(bsm).then(res => { | ||
33 | if (res.success) { | ||
34 | let qszt = res.result.qszt; | ||
35 | this.isDisabled = +qszt !== 0; | ||
36 | } | ||
37 | }) | ||
38 | }, | ||
27 | handleClick(tab, event) { | 39 | handleClick(tab, event) { |
40 | this.loadingStatus(); | ||
28 | switch (tab.name) { | 41 | switch (tab.name) { |
29 | case 'dzxx': | 42 | case 'dzxx': |
30 | this.dzJbxxVisble = true; | 43 | this.dzJbxxVisble = true; |
... | @@ -43,4 +56,22 @@ | ... | @@ -43,4 +56,22 @@ |
43 | watch: {}, | 56 | watch: {}, |
44 | }; | 57 | }; |
45 | </script> | 58 | </script> |
46 | <style scoped lang="less"></style> | 59 | <style scoped lang="less"> |
60 | .el-tabs{ | ||
61 | height: calc(100% - 50px); | ||
62 | /deep/.el-tabs__content{ | ||
63 | //height: 100%; | ||
64 | /deep/.el-tab-pane{ | ||
65 | height: 100%; | ||
66 | } | ||
67 | background: #eaedf5; | ||
68 | padding: 0; | ||
69 | } | ||
70 | /deep/ .el-tabs__item { | ||
71 | height: 48px; | ||
72 | } | ||
73 | /deep/ .el-tabs__header{ | ||
74 | background-color: #ffffff; | ||
75 | } | ||
76 | } | ||
77 | </style> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="gzw content-form"> | 2 | <div class="gzw content-form"> |
3 | <el-form ref="form" :model="form" label-width="160px"> | 3 | <el-form ref="form" :model="form" label-width="160px"> |
4 | <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr> | 4 | <Qlr ref="qlrxxModule" :bsm="bsm" :type="lx"></Qlr> |
5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="gzwTable"> | 5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="gzwTable"> |
6 | <tr height="30"> | 6 | <tr height="30"> |
7 | <th colspan="12"><font size="4"></font>构筑物基本信息</th> | 7 | <th colspan="12"><font size="4"></font>构筑物基本信息</th> |
... | @@ -13,17 +13,17 @@ | ... | @@ -13,17 +13,17 @@ |
13 | </td> | 13 | </td> |
14 | <td colspan="2" align="center" >项目名称</td> | 14 | <td colspan="2" align="center" >项目名称</td> |
15 | <td colspan="4" > | 15 | <td colspan="4" > |
16 | <input class="formInput" v-model="form.xmmc" :disabled="form.qszt!=='0'"> | 16 | <input class="formInput" v-model="form.xmmc" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="xmmc"> |
17 | </td> | 17 | </td> |
18 | </tr> | 18 | </tr> |
19 | <tr height="30"> | 19 | <tr height="30"> |
20 | <td colspan="2" align="center" >坐落</td> | 20 | <td colspan="2" align="center" >坐落</td> |
21 | <td colspan="4" > | 21 | <td colspan="4" > |
22 | <input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'"> | 22 | <input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="zl"> |
23 | </td> | 23 | </td> |
24 | <td colspan="2" align="center" >不动产单元号</td> | 24 | <td colspan="2" align="center" >不动产单元号</td> |
25 | <td colspan="4" class="psr"> | 25 | <td colspan="4" class="psr"> |
26 | <input class="formInput percent80" maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'"> | 26 | <input class="formInput percent80" maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="bdcdyh"> |
27 | <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button> | 27 | <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button> |
28 | </td> | 28 | </td> |
29 | </tr> | 29 | </tr> |
... | @@ -114,6 +114,7 @@ | ... | @@ -114,6 +114,7 @@ |
114 | label: 'mc' | 114 | label: 'mc' |
115 | }, | 115 | }, |
116 | 116 | ||
117 | lx:'gzw', | ||
117 | bsm:'', | 118 | bsm:'', |
118 | form:{ | 119 | form:{ |
119 | zdzhdm:'', | 120 | zdzhdm:'', |
... | @@ -129,6 +130,7 @@ | ... | @@ -129,6 +130,7 @@ |
129 | bsm:'', | 130 | bsm:'', |
130 | }, | 131 | }, |
131 | zdbsm:'', | 132 | zdbsm:'', |
133 | rules:[], | ||
132 | } | 134 | } |
133 | }, | 135 | }, |
134 | methods:{ | 136 | methods:{ |
... | @@ -140,6 +142,16 @@ | ... | @@ -140,6 +142,16 @@ |
140 | } | 142 | } |
141 | }) | 143 | }) |
142 | }, | 144 | }, |
145 | |||
146 | inputBlur(e) { | ||
147 | if (e.target.value != '') { | ||
148 | e.target.style.border = "" | ||
149 | } else { | ||
150 | e.target.style.border = "1px solid red"; | ||
151 | e.target.style.boxSizing = 'border-box'; | ||
152 | } | ||
153 | }, | ||
154 | |||
143 | generatorCode(){ | 155 | generatorCode(){ |
144 | if(this.form.bdcdyh!=null&&this.form.bdcdyh!==''){ | 156 | if(this.form.bdcdyh!=null&&this.form.bdcdyh!==''){ |
145 | this.open(); | 157 | this.open(); |
... | @@ -182,15 +194,58 @@ | ... | @@ -182,15 +194,58 @@ |
182 | }); | 194 | }); |
183 | }, | 195 | }, |
184 | onSave(){ | 196 | onSave(){ |
185 | console.log(this.form,'this.form'); | 197 | |
186 | this.bsm=this.$route.query.bsm; | 198 | this.rules=[ |
187 | this.form.bsm=this.bsm; | 199 | { |
188 | this.form.jgsj=this.form.jgrq; | 200 | data:this.form.bdcdyh, |
189 | updateGzwjbxx(this.form).then((res)=>{ | 201 | name:'不动产单元号', |
190 | if(res.code === 200){ | 202 | dom:this.$refs.bdcdyh, |
191 | this.$message.success("保存完成!"); | 203 | rule: /^\s*$/g, //非空 |
204 | }, | ||
205 | { | ||
206 | data:this.form.xmmc, | ||
207 | name:'项目名称', | ||
208 | dom:this.$refs.xmmc, | ||
209 | rule: /^\s*$/g, //非空 | ||
210 | }, | ||
211 | { | ||
212 | data:this.form.zl, | ||
213 | name:'坐落', | ||
214 | dom:this.$refs.zl, | ||
215 | rule: /^\s*$/g, //非空 | ||
216 | }, | ||
217 | ] | ||
218 | |||
219 | let flag = true; | ||
220 | this.rules.forEach(item=>{ | ||
221 | if(item.rule.test(item.data) || item.data == null){ | ||
222 | if(item.dom.$el){ | ||
223 | item.dom.$el.style.border = '1px solid red'; | ||
224 | item.dom.$el.style.boxSizing = 'border-box'; | ||
225 | }else{ | ||
226 | item.dom.style.border = '1px solid red'; | ||
227 | item.dom.style.boxSizing = 'border-box'; | ||
228 | } | ||
229 | flag = false; | ||
230 | return false | ||
192 | } | 231 | } |
193 | }) | 232 | }) |
233 | |||
234 | this.$nextTick(()=> { | ||
235 | if (flag) { | ||
236 | console.log(this.form,'this.form'); | ||
237 | this.bsm=this.$route.query.bsm; | ||
238 | this.form.bsm=this.bsm; | ||
239 | this.form.jgsj=this.form.jgrq; | ||
240 | updateGzwjbxx(this.form).then((res)=>{ | ||
241 | if(res.code === 200){ | ||
242 | this.$message.success("保存完成!"); | ||
243 | } | ||
244 | }) | ||
245 | } | ||
246 | }) | ||
247 | |||
248 | |||
194 | }, | 249 | }, |
195 | getGzwDetailInfo(data){ | 250 | getGzwDetailInfo(data){ |
196 | getQjGzwDetailInfo(data).then((res)=>{ | 251 | getQjGzwDetailInfo(data).then((res)=>{ |
... | @@ -206,6 +261,9 @@ | ... | @@ -206,6 +261,9 @@ |
206 | this.form.qszt = res.result.qszt; | 261 | this.form.qszt = res.result.qszt; |
207 | this.zdbsm = res.result.zdzhbsm; | 262 | this.zdbsm = res.result.zdzhbsm; |
208 | this.getZddm(this.zdbsm); | 263 | this.getZddm(this.zdbsm); |
264 | if(res.result.gygyqlrqk!=null){ | ||
265 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); | ||
266 | } | ||
209 | } | 267 | } |
210 | }) | 268 | }) |
211 | }, | 269 | }, |
... | @@ -219,6 +277,7 @@ | ... | @@ -219,6 +277,7 @@ |
219 | if(res.code===200){ | 277 | if(res.code===200){ |
220 | this.$message.success("提交完成!"); | 278 | this.$message.success("提交完成!"); |
221 | this.getGzwDetailInfo(this.bsm) | 279 | this.getGzwDetailInfo(this.bsm) |
280 | this.getTreeByBsm(this.bsm,'gzw','0,1,2') | ||
222 | } | 281 | } |
223 | }) | 282 | }) |
224 | }, | 283 | }, |
... | @@ -252,6 +311,12 @@ | ... | @@ -252,6 +311,12 @@ |
252 | this.getGzwDetailInfo(val) | 311 | this.getGzwDetailInfo(val) |
253 | this.reload() | 312 | this.reload() |
254 | }, | 313 | }, |
314 | |||
315 | "form.bdcdyh":function (val) { | ||
316 | if (val != '') { | ||
317 | this.$refs.bdcdyh.style.border = ''; | ||
318 | } | ||
319 | }, | ||
255 | } | 320 | } |
256 | } | 321 | } |
257 | </script> | 322 | </script> | ... | ... |
src/views/login/images/logo-login.png
0 → 100644
25.6 KB
1 | <template> | 1 | <template> |
2 | <div id="login"> | 2 | <div id="login"> |
3 | <img class="login-logo" src="./images/logo-login.svg" /> | 3 | <div class="login-logo"><img src="./images/logo-login.png" /></div> |
4 | <div class="login-con"> | 4 | <div class="login-con"> |
5 | <div class="login-title">用户登录</div> | 5 | <!-- <div class="login-title">用户登录</div>--> |
6 | <div class="login-user" :class="{ 'select-border': change.user }"> | 6 | <div class="login-user" :class="{ 'select-border': change.user }"> |
7 | <img class="user-icon" src="./images/user.svg" /> | 7 | <img class="user-icon" src="./images/user.svg" /> |
8 | <div class="line-mid"></div> | 8 | <!-- <div class="line-mid"></div>--> |
9 | <input | 9 | <input |
10 | type="text" | 10 | type="text" |
11 | class="user-input" | 11 | class="user-input" |
... | @@ -18,7 +18,7 @@ | ... | @@ -18,7 +18,7 @@ |
18 | </div> | 18 | </div> |
19 | <div class="login-user user-mt" :class="{ 'select-border': change.pass }"> | 19 | <div class="login-user user-mt" :class="{ 'select-border': change.pass }"> |
20 | <img class="user-icon" src="./images/password.svg" /> | 20 | <img class="user-icon" src="./images/password.svg" /> |
21 | <div class="line-mid"></div> | 21 | <!-- <div class="line-mid"></div>--> |
22 | <input | 22 | <input |
23 | type="password" | 23 | type="password" |
24 | class="user-input" | 24 | class="user-input" |
... | @@ -184,74 +184,82 @@ export default { | ... | @@ -184,74 +184,82 @@ export default { |
184 | #login { | 184 | #login { |
185 | width: 100vw; | 185 | width: 100vw; |
186 | height: 100vh; | 186 | height: 100vh; |
187 | background: url("./images/login-bg.png") center center no-repeat; | 187 | background: url("./images/login-bg.png") no-repeat bottom center; |
188 | background-size: 100% 100%; | 188 | background-size: 100% 100%; |
189 | overflow: hidden; | 189 | overflow: hidden; |
190 | position: relative; | 190 | //position: relative; |
191 | .login-logo { | 191 | .login-logo { |
192 | display: block; | 192 | //display: block; |
193 | margin: 0 auto; | 193 | //position: absolute; |
194 | position: absolute; | 194 | //top: 8%; |
195 | top: 11.5%; | 195 | //left: 0; |
196 | left: 0; | 196 | //right: 0; |
197 | right: 0; | 197 | margin-top: 8%; |
198 | margin: 0 auto; | 198 | height: 38px; |
199 | width: 360px; | 199 | width: 100%; |
200 | text-align: center; | ||
200 | } | 201 | } |
202 | .login-logo img{ | ||
203 | height: 100%; | ||
204 | } | ||
201 | .login-con { | 205 | .login-con { |
202 | position: absolute; | 206 | //position: absolute; |
203 | top: 24%; | 207 | //top: 24%; |
204 | left: 0; | 208 | //left: 0; |
205 | right: 0; | 209 | //right: 0; |
206 | margin: 0 auto; | 210 | margin: 88px auto; |
207 | } | 211 | width: 380px; |
208 | .login-title { | 212 | |
209 | width: 320px; | ||
210 | margin: 0 auto; | ||
211 | font-size: 14px; | ||
212 | font-weight: 500; | ||
213 | } | 213 | } |
214 | //.login-title { | ||
215 | // width: 320px; | ||
216 | // margin: 0 auto; | ||
217 | // font-size: 14px; | ||
218 | // font-weight: 500; | ||
219 | //} | ||
214 | .login-user { | 220 | .login-user { |
215 | width: 320px; | 221 | width: 100%; |
216 | height: 38px; | 222 | height: 46px; |
217 | border: 1px solid rgba(155, 155, 155, 1); | 223 | border: 1px solid rgba(155, 155, 155, 1); |
218 | box-sizing: border-box; | 224 | box-sizing: border-box; |
219 | margin: 0 auto; | 225 | margin: 38px auto auto auto; |
220 | margin-top: 20px; | ||
221 | border-radius: 2px; | 226 | border-radius: 2px; |
222 | position: relative; | 227 | //position: relative; |
223 | .user-icon { | 228 | .user-icon { |
224 | margin: 0 12px; | 229 | float: left; |
225 | float: left; | 230 | margin: 13px auto auto 10px; |
226 | width: 16px; | 231 | //float: left; |
227 | height: 16px; | 232 | width: 28px; |
228 | margin-top: 11px; | 233 | height: 18px; |
229 | } | 234 | //margin-top: 11px; |
230 | .line-mid { | ||
231 | width: 1px; | ||
232 | height: 16px; | ||
233 | background: #cbcbcb; | ||
234 | float: left; | ||
235 | margin-top: 11px; | ||
236 | margin-right: 9px; | ||
237 | } | 235 | } |
236 | //.line-mid { | ||
237 | // width: 1px; | ||
238 | // height: 16px; | ||
239 | // background: #cbcbcb; | ||
240 | // float: left; | ||
241 | // margin-top: 11px; | ||
242 | // margin-right: 9px; | ||
243 | //} | ||
238 | .user-input { | 244 | .user-input { |
239 | width: 230px; | 245 | width: 80%; |
240 | float: left; | 246 | float: left; |
241 | font-size: 12px; | 247 | font-size: 16px; |
242 | margin-top: 11px; | 248 | //margin-top: 11px; |
243 | background: none; | 249 | //background: none; |
244 | outline: 0; | 250 | outline: 0; |
245 | border: 0; | 251 | border: none; |
246 | color: #4a4a4a; | 252 | color: #4a4a4a; |
247 | box-shadow: inset 0 0 0 1000px #fff !important; | 253 | line-height: 266%; |
254 | //box-shadow: inset 0 0 0 1000px #fff !important; | ||
255 | |||
248 | } | 256 | } |
249 | .password-eye { | 257 | .password-eye { |
250 | float: right; | 258 | float: right; |
251 | width: 16px; | 259 | width: 16px; |
252 | height: 16px; | 260 | height: 16px; |
253 | margin-right: 12px; | 261 | margin-right: 12px; |
254 | margin-top: 11px; | 262 | margin-top: 13px; |
255 | cursor: pointer; | 263 | cursor: pointer; |
256 | } | 264 | } |
257 | .warning { | 265 | .warning { |
... | @@ -297,7 +305,7 @@ export default { | ... | @@ -297,7 +305,7 @@ export default { |
297 | } | 305 | } |
298 | } | 306 | } |
299 | .login-btn { | 307 | .login-btn { |
300 | width: 320px; | 308 | width: 100%; |
301 | height: 40px; | 309 | height: 40px; |
302 | background: rgba(0, 127, 255, 1); | 310 | background: rgba(0, 127, 255, 1); |
303 | border-radius: 1px; | 311 | border-radius: 1px; |
... | @@ -310,11 +318,8 @@ export default { | ... | @@ -310,11 +318,8 @@ export default { |
310 | cursor: pointer; | 318 | cursor: pointer; |
311 | } | 319 | } |
312 | .reserved-con { | 320 | .reserved-con { |
313 | position: absolute; | 321 | |
314 | bottom: 36%; | 322 | margin: 38px auto; |
315 | left: 0; | ||
316 | right: 0; | ||
317 | margin: 0 auto; | ||
318 | } | 323 | } |
319 | .reserved-words { | 324 | .reserved-words { |
320 | font-size: 12px; | 325 | font-size: 12px; | ... | ... |
... | @@ -263,7 +263,7 @@ export default { | ... | @@ -263,7 +263,7 @@ export default { |
263 | zddm: "", | 263 | zddm: "", |
264 | zl: "", | 264 | zl: "", |
265 | pageNo: 1, | 265 | pageNo: 1, |
266 | pageSize: 12, | 266 | pageSize: 15, |
267 | type:'add', | 267 | type:'add', |
268 | }, | 268 | }, |
269 | Data: [], | 269 | Data: [], |
... | @@ -369,7 +369,7 @@ export default { | ... | @@ -369,7 +369,7 @@ export default { |
369 | zddm: "", | 369 | zddm: "", |
370 | zl: "", | 370 | zl: "", |
371 | pageNo: 1, | 371 | pageNo: 1, |
372 | pageSize: 12 | 372 | pageSize: 15 |
373 | }; | 373 | }; |
374 | this.getData(this.queryData); | 374 | this.getData(this.queryData); |
375 | }, | 375 | }, | ... | ... |
... | @@ -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"> |
... | @@ -44,13 +44,13 @@ | ... | @@ -44,13 +44,13 @@ |
44 | </el-card> | 44 | </el-card> |
45 | </div> | 45 | </div> |
46 | </div> | 46 | </div> |
47 | <div class="fgh" :style="{'minHeight':tableHeight+'px'}"> | 47 | <div class="fgh" :style="{'height':tableHeight+'px'}"> |
48 | <span class="tips">分割后宗地信息(总计分割宗地数量{{zdFghData.newZdlist.length}}个)</span> | 48 | <span class="tips">分割后宗地信息(总计分割宗地数量{{zdFghData.newZdlist.length}}个)</span> |
49 | <table border="1"> | 49 | <table border="1"> |
50 | <tr> | 50 | <tr> |
51 | <th class="cz"> | 51 | <th class="cz"> |
52 | <i class="iconfont iconicon-test2 " style="color:#66b1ff;font-size:30px" @click="addRow"></i> | 52 | <i class="iconfont iconicon-test2 " style="color:#66b1ff;font-size:30px" @click="addRow"></i> |
53 | 53 | ||
54 | </th> | 54 | </th> |
55 | <th class="xh">序号</th> | 55 | <th class="xh">序号</th> |
56 | <th class="xzq">行政区</th> | 56 | <th class="xzq">行政区</th> |
... | @@ -214,7 +214,7 @@ | ... | @@ -214,7 +214,7 @@ |
214 | </el-card> | 214 | </el-card> |
215 | </div> | 215 | </div> |
216 | </div> | 216 | </div> |
217 | <div class="fgh"> | 217 | <div class="fgh" :style="{'height':tableHeight+'px'}"> |
218 | <span class="tips">分割后多幢信息(总计分割多幢数量{{dzFghData.fwlist.length}}个)</span> | 218 | <span class="tips">分割后多幢信息(总计分割多幢数量{{dzFghData.fwlist.length}}个)</span> |
219 | <table border="1"> | 219 | <table border="1"> |
220 | <tr> | 220 | <tr> |
... | @@ -315,7 +315,7 @@ | ... | @@ -315,7 +315,7 @@ |
315 | 315 | ||
316 | export default { | 316 | export default { |
317 | name: "", | 317 | name: "", |
318 | inject: ['getTreeByS'], | 318 | inject: ['getTreeByS','getRightTree'], |
319 | components: {zdQueryData,dzQueryData,hfghb}, | 319 | components: {zdQueryData,dzQueryData,hfghb}, |
320 | props: {}, | 320 | props: {}, |
321 | data() { | 321 | data() { |
... | @@ -634,6 +634,7 @@ | ... | @@ -634,6 +634,7 @@ |
634 | } | 634 | } |
635 | saveDzFg(this.dzFghData).then(res => { | 635 | saveDzFg(this.dzFghData).then(res => { |
636 | if (res.success) { | 636 | if (res.success) { |
637 | this.getRightTree(res.result,'0,1,2'); | ||
637 | Message.success("保存成功") | 638 | Message.success("保存成功") |
638 | //TO DO 多幢分割完成后的操作 | 639 | //TO DO 多幢分割完成后的操作 |
639 | } else { | 640 | } else { |
... | @@ -1162,6 +1163,7 @@ | ... | @@ -1162,6 +1163,7 @@ |
1162 | } | 1163 | } |
1163 | } | 1164 | } |
1164 | .header-button { | 1165 | .header-button { |
1166 | z-index: 3; | ||
1165 | height: 50px; | 1167 | height: 50px; |
1166 | position: fixed; | 1168 | position: fixed; |
1167 | bottom: 0; | 1169 | bottom: 0; | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -342,7 +342,7 @@ export default { | ... | @@ -342,7 +342,7 @@ export default { |
342 | bdcdyh:'', | 342 | bdcdyh:'', |
343 | bdcqzh:'', | 343 | bdcqzh:'', |
344 | pageNo:1, | 344 | pageNo:1, |
345 | pageSize:10, | 345 | pageSize:15, |
346 | type:'all' | 346 | type:'all' |
347 | }; | 347 | }; |
348 | this.search() | 348 | this.search() |
... | @@ -514,7 +514,7 @@ export default { | ... | @@ -514,7 +514,7 @@ export default { |
514 | if (n) { | 514 | if (n) { |
515 | this.lpbContentwidth -= 204; | 515 | this.lpbContentwidth -= 204; |
516 | } else { | 516 | } else { |
517 | this.lpbContentwidth += 204; | 517 | this.lpbContentwidth += 200; |
518 | } | 518 | } |
519 | }, | 519 | }, |
520 | //选择自然幢展示楼盘表后,查询右侧图例数据 | 520 | //选择自然幢展示楼盘表后,查询右侧图例数据 |
... | @@ -522,9 +522,10 @@ export default { | ... | @@ -522,9 +522,10 @@ export default { |
522 | if (!n) { | 522 | if (!n) { |
523 | this.getDyztBsmList(); | 523 | this.getDyztBsmList(); |
524 | this.getLpbFwytAndQlxz(); | 524 | this.getLpbFwytAndQlxz(); |
525 | this.$nextTick(()=>{ | 525 | // console.log(this.$refs.lpbContentWrap.clientWidth,'lpbContentWrap'); |
526 | this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; | 526 | // this.$nextTick(()=>{ |
527 | }) | 527 | // this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; |
528 | // }) | ||
528 | } | 529 | } |
529 | }, | 530 | }, |
530 | //改变syclx,更新楼盘表数据 | 531 | //改变syclx,更新楼盘表数据 | ... | ... |
... | @@ -73,6 +73,7 @@ export default { | ... | @@ -73,6 +73,7 @@ export default { |
73 | height: calc(100% - 50px); | 73 | height: calc(100% - 50px); |
74 | /deep/.el-tabs__content{ | 74 | /deep/.el-tabs__content{ |
75 | height: 100%; | 75 | height: 100%; |
76 | position: unset; | ||
76 | /deep/.el-tab-pane{ | 77 | /deep/.el-tab-pane{ |
77 | height: calc(100% - 40px); | 78 | height: calc(100% - 40px); |
78 | } | 79 | } | ... | ... |
... | @@ -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 |
... | @@ -330,6 +330,7 @@ export default { | ... | @@ -330,6 +330,7 @@ export default { |
330 | .then((res) => { | 330 | .then((res) => { |
331 | if (res.code == "200") { | 331 | if (res.code == "200") { |
332 | //获取左侧树数据 | 332 | //获取左侧树数据 |
333 | this.$store.state.oldZdbsm = ''; | ||
333 | this.getTreeByBsm(res.result.bsm,'zrz','0,1,2'); | 334 | this.getTreeByBsm(res.result.bsm,'zrz','0,1,2'); |
334 | this.$message({ | 335 | this.$message({ |
335 | message: "创建成功!", | 336 | message: "创建成功!", | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main"> | 2 | <div class="main" style="padding: 18px!important;"> |
3 | <div class="panel content_box"> | 3 | <div class="panel content_box"> |
4 | <el-card class="panel_left"> | 4 | <el-card class="panel_left"> |
5 | <div slot="header" class="clearfix"> | 5 | <div slot="header" class="clearfix"> |
... | @@ -224,6 +224,7 @@ export default { | ... | @@ -224,6 +224,7 @@ export default { |
224 | flex-direction: column; | 224 | flex-direction: column; |
225 | overflow: hidden; | 225 | overflow: hidden; |
226 | height: 100%; | 226 | height: 100%; |
227 | |||
227 | .clearfix { | 228 | .clearfix { |
228 | span { | 229 | span { |
229 | color: #6d7278; | 230 | color: #6d7278; |
... | @@ -244,6 +245,7 @@ export default { | ... | @@ -244,6 +245,7 @@ export default { |
244 | .panel { | 245 | .panel { |
245 | @flex(); | 246 | @flex(); |
246 | width: 100%; | 247 | width: 100%; |
248 | padding: 0 0 18px!important; | ||
247 | .panel_left { | 249 | .panel_left { |
248 | width: 35%; | 250 | width: 35%; |
249 | margin-right: 20px; | 251 | margin-right: 20px; |
... | @@ -309,7 +311,7 @@ export default { | ... | @@ -309,7 +311,7 @@ export default { |
309 | } | 311 | } |
310 | .notice { | 312 | .notice { |
311 | padding: 0; | 313 | padding: 0; |
312 | height: calc(100% - 285px); | 314 | height: calc(100% - 266px); |
313 | @flex(); | 315 | @flex(); |
314 | .news { | 316 | .news { |
315 | float: left; | 317 | float: left; | ... | ... |
... | @@ -179,6 +179,7 @@ | ... | @@ -179,6 +179,7 @@ |
179 | updateQsztByBsm(data) | 179 | updateQsztByBsm(data) |
180 | .then((res => { | 180 | .then((res => { |
181 | if (res.code == 200) { | 181 | if (res.code == 200) { |
182 | this.$store.state.oldZdbsm = ''; | ||
182 | switch (row.dylx) { | 183 | switch (row.dylx) { |
183 | case "zd": | 184 | case "zd": |
184 | this.$store.state.zdbsm = row.glbsm; | 185 | this.$store.state.zdbsm = row.glbsm; | ... | ... |
... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
14 | > | 14 | > |
15 | <el-table-column type="index" width="80" align="center" label="序号"> | 15 | <el-table-column type="index" width="80" align="center" label="序号"> |
16 | </el-table-column> | 16 | </el-table-column> |
17 | <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> | 17 | <el-table-column prop="bdcdyh" align="left" width="260" label="不动产单元号"> |
18 | </el-table-column> | 18 | </el-table-column> |
19 | <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> | 19 | <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> |
20 | </el-table-column> | 20 | </el-table-column> |
... | @@ -25,7 +25,7 @@ | ... | @@ -25,7 +25,7 @@ |
25 | {{scope.row.dylx | bdcLxFilter}} | 25 | {{scope.row.dylx | bdcLxFilter}} |
26 | </template> | 26 | </template> |
27 | </el-table-column> | 27 | </el-table-column> |
28 | <el-table-column prop="qsztValue" align="left" label="权属状态"> | 28 | <el-table-column prop="qsztValue" align="left" width="100" label="权属状态"> |
29 | </el-table-column> | 29 | </el-table-column> |
30 | <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> | 30 | <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> |
31 | </el-table-column> | 31 | </el-table-column> | ... | ... |
... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,7 @@ |
8 | <djb v-if="djbVisible"></djb> | 8 | <djb v-if="djbVisible"></djb> |
9 | </el-tab-pane> | 9 | </el-tab-pane> |
10 | <el-tab-pane label="附件材料" name="fjcl"> | 10 | <el-tab-pane label="附件材料" name="fjcl"> |
11 | <fjcl v-if="fjclVisible"></fjcl> | 11 | <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl> |
12 | </el-tab-pane> | 12 | </el-tab-pane> |
13 | </el-tabs> | 13 | </el-tabs> |
14 | </div> | 14 | </div> |
... | @@ -26,6 +26,7 @@ | ... | @@ -26,6 +26,7 @@ |
26 | }, | 26 | }, |
27 | data() { | 27 | data() { |
28 | return { | 28 | return { |
29 | isDisabled:false, | ||
29 | hbsm:this.$store.state.hbsm, | 30 | hbsm:this.$store.state.hbsm, |
30 | activeName: "hjbxx", | 31 | activeName: "hjbxx", |
31 | djbVisible: false, | 32 | djbVisible: false, |
... | @@ -36,7 +37,18 @@ | ... | @@ -36,7 +37,18 @@ |
36 | 37 | ||
37 | }, | 38 | }, |
38 | methods: { | 39 | methods: { |
40 | loadingStatus() { | ||
41 | console.log("是否禁用") | ||
42 | let bsm=this.$store.state.hbsm; | ||
43 | queryStatus(bsm).then(res => { | ||
44 | if (res.success) { | ||
45 | let qszt = res.result.qszt; | ||
46 | this.isDisabled = +qszt !== 0; | ||
47 | } | ||
48 | }) | ||
49 | }, | ||
39 | handleClick(tab, event) { | 50 | handleClick(tab, event) { |
51 | this.loadingStatus() | ||
40 | // console.log(tab, event); | 52 | // console.log(tab, event); |
41 | switch (tab.name) { | 53 | switch (tab.name) { |
42 | case 'djb': | 54 | case 'djb': | ... | ... |
... | @@ -12,8 +12,9 @@ | ... | @@ -12,8 +12,9 @@ |
12 | :show-file-list="false" | 12 | :show-file-list="false" |
13 | multiple | 13 | multiple |
14 | :on-exceed="handleExceed" | 14 | :on-exceed="handleExceed" |
15 | :disabled="isDisabled" | ||
15 | > | 16 | > |
16 | <el-button size="small" type="primary">上传</el-button> | 17 | <el-button size="small" type="primary" :disabled="isDisabled" >上传</el-button> |
17 | </el-upload> | 18 | </el-upload> |
18 | <table border="2"> | 19 | <table border="2"> |
19 | <tr> | 20 | <tr> |
... | @@ -22,12 +23,12 @@ | ... | @@ -22,12 +23,12 @@ |
22 | <th class="lx">文件类型</th> | 23 | <th class="lx">文件类型</th> |
23 | <th class="cz">操作</th> | 24 | <th class="cz">操作</th> |
24 | </tr> | 25 | </tr> |
25 | <tr v-if="list.length==0"> | 26 | <tr v-if="list.length===0"> |
26 | <td colspan="4" class="noData" > | 27 | <td colspan="4" class="noData"> |
27 | <span>暂无数据</span> | 28 | <span>暂无数据</span> |
28 | </td> | 29 | </td> |
29 | </tr> | 30 | </tr> |
30 | <tr v-else v-for="(item,index) in list" :key="index" > | 31 | <tr v-else v-for="(item,index) in list" :key="index"> |
31 | <td class="xh">{{index+1}}</td> | 32 | <td class="xh">{{index+1}}</td> |
32 | <td class="mc">{{item.filename}}</td> | 33 | <td class="mc">{{item.filename}}</td> |
33 | <td class="lx">{{item.filepostfix}}</td> | 34 | <td class="lx">{{item.filepostfix}}</td> |
... | @@ -44,47 +45,43 @@ | ... | @@ -44,47 +45,43 @@ |
44 | </template> | 45 | </template> |
45 | 46 | ||
46 | <script> | 47 | <script> |
47 | import {insertFile, getFileLis, downloadFile,loadFile,deleteFile} from "@api/common" | 48 | import {insertFile, getFileLis, downloadFile, loadFile, deleteFile} from "@api/common" |
48 | import {Message} from "element-ui" | 49 | import {queryStatus} from "@api/search" |
49 | 50 | ||
50 | export default { | 51 | export default { |
51 | name: "fjcl", | 52 | name: "fjcl", |
52 | data() { | 53 | data() { |
53 | return { | 54 | return { |
54 | fileData:{ | 55 | fileData: { |
55 | glbsm:'', | 56 | glbsm: '', |
56 | dylx:'' | 57 | dylx: '' |
57 | }, | 58 | }, |
58 | list: [ | 59 | list: [] |
59 | ], | ||
60 | /* filesData: { | ||
61 | dylx: "", | ||
62 | glbsm: "", | ||
63 | list: [ | ||
64 | { | ||
65 | filename: "", | ||
66 | filepostfix: "", | ||
67 | fileurl: "", | ||
68 | preViewUrl:"" | ||
69 | } | ||
70 | ] | ||
71 | },*/ | ||
72 | } | 60 | } |
73 | }, | 61 | }, |
74 | mounted() { | 62 | mounted() { |
75 | this.getFileList() | 63 | this.getFileList() |
76 | }, | 64 | }, |
65 | created(){ | ||
66 | |||
67 | }, | ||
68 | props: { | ||
69 | isDisabled:{ | ||
70 | type:Boolean, | ||
71 | default:false | ||
72 | } | ||
73 | }, | ||
77 | methods: { | 74 | methods: { |
78 | deleteFile(bsm){ | 75 | deleteFile(bsm) { |
79 | this.$confirm('将删除该文件, 是否继续?', '提示', { | 76 | this.$confirm('将删除该文件, 是否继续?', '提示', { |
80 | confirmButtonText: '确定', | 77 | confirmButtonText: '确定', |
81 | cancelButtonText: '取消', | 78 | cancelButtonText: '取消', |
82 | type: 'warning' | 79 | type: 'warning' |
83 | }).then(() => { | 80 | }).then(() => { |
84 | deleteFile(bsm).then(res=>{ | 81 | deleteFile(bsm).then(res => { |
85 | if (res.success) { | 82 | if (res.success) { |
86 | this.getFileList(); | 83 | this.getFileList(); |
87 | }else { | 84 | } else { |
88 | this.$message.error("删除失败") | 85 | this.$message.error("删除失败") |
89 | } | 86 | } |
90 | }) | 87 | }) |
... | @@ -95,38 +92,38 @@ | ... | @@ -95,38 +92,38 @@ |
95 | }); | 92 | }); |
96 | }); | 93 | }); |
97 | }, | 94 | }, |
98 | loadFile(bsm){ | 95 | loadFile(bsm) { |
99 | loadFile(bsm).then(res=>{ | 96 | loadFile(bsm).then(res => { |
100 | if (res.success) { | 97 | if (res.success) { |
101 | window.open(res.message) | 98 | window.open(res.message) |
102 | } | 99 | } |
103 | }) | 100 | }) |
104 | }, | 101 | }, |
105 | downloadFile(url) { | 102 | downloadFile(url) { |
106 | window.open(`/api/file/download?url=`+url); | 103 | window.open(`/api/file/download?url=` + url); |
107 | }, | 104 | }, |
108 | getFileList() { | 105 | getFileList() { |
109 | switch (this.$route.name) { | 106 | switch (this.$route.name) { |
110 | case "宗地": | 107 | case "宗地": |
111 | this.fileData.dylx = 'zd'; | 108 | this.fileData.dylx = 'zd'; |
112 | this.fileData.glbsm = this.$store.state.zdbsm | 109 | this.fileData.glbsm = this.$store.state.zdbsm; |
113 | break; | 110 | break; |
114 | case "自然幢": | 111 | case "自然幢": |
115 | this.fileData.dylx = 'zrz'; | 112 | this.fileData.dylx = 'zrz'; |
116 | this.fileData.glbsm = this.$store.state.zrzbsm | 113 | this.fileData.glbsm = this.$store.state.zrzbsm; |
117 | break | 114 | break; |
118 | case "多幢": | 115 | case "多幢": |
119 | this.fileData.dylx = 'dz'; | 116 | this.fileData.dylx = 'dz'; |
120 | this.fileData.glbsm = this.$store.state.dzbsm | 117 | this.fileData.glbsm = this.$store.state.dzbsm; |
121 | break | 118 | break; |
122 | case "户": | 119 | case "户": |
123 | this.fileData.dylx = 'h'; | 120 | this.fileData.dylx = 'h'; |
124 | this.fileData.glbsm = this.$store.state.hbsm | 121 | this.fileData.glbsm = this.$store.state.hbsm; |
125 | break; | 122 | break; |
126 | default: | 123 | default: |
127 | break | 124 | break |
128 | } | 125 | } |
129 | getFileLis(this.fileData.glbsm ).then(res => { | 126 | getFileLis(this.fileData.glbsm).then(res => { |
130 | if (res.success) { | 127 | if (res.success) { |
131 | this.list = res.result; | 128 | this.list = res.result; |
132 | } else { | 129 | } else { |
... | @@ -148,7 +145,7 @@ | ... | @@ -148,7 +145,7 @@ |
148 | }, | 145 | }, |
149 | handleExceed(files, fileList) { | 146 | handleExceed(files, fileList) { |
150 | console.log(fileList) | 147 | console.log(fileList) |
151 | // this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`); | 148 | // this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`); |
152 | this.$message.warning("上传失败") | 149 | this.$message.warning("上传失败") |
153 | }, | 150 | }, |
154 | beforeRemove(file, fileList) { | 151 | beforeRemove(file, fileList) { |
... | @@ -185,19 +182,19 @@ | ... | @@ -185,19 +182,19 @@ |
185 | color: blue; | 182 | color: blue; |
186 | text-decoration: underline; | 183 | text-decoration: underline; |
187 | } | 184 | } |
188 | .xh{ | 185 | .xh { |
189 | width: 100px; | 186 | width: 100px; |
190 | } | 187 | } |
191 | .mc{ | 188 | .mc { |
192 | width: 300px; | 189 | width: 300px; |
193 | } | 190 | } |
194 | .lx{ | 191 | .lx { |
195 | width: 120px; | 192 | width: 120px; |
196 | } | 193 | } |
197 | .cz{ | 194 | .cz { |
198 | width: 150px; | 195 | width: 150px; |
199 | } | 196 | } |
200 | .noData span{ | 197 | .noData span { |
201 | color: #BBB; | 198 | color: #BBB; |
202 | } | 199 | } |
203 | } | 200 | } | ... | ... |
... | @@ -2,12 +2,17 @@ | ... | @@ -2,12 +2,17 @@ |
2 | <!-- <div class="content_box"> --> | 2 | <!-- <div class="content_box"> --> |
3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > | 3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > |
4 | <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> | 4 | <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> |
5 | <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane> | 5 | <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane> |
6 | <el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane> | 6 | <el-tab-pane label="界址点" name="jzd"> |
7 | <el-tab-pane label="界址线" name="jzx"><jzx v-if="jzxVisible"></jzx></el-tab-pane> | 7 | <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd> |
8 | </el-tab-pane> | ||
9 | <el-tab-pane label="界址线" name="jzx" > | ||
10 | <jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx> | ||
11 | </el-tab-pane> | ||
8 | <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane> | 12 | <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane> |
9 | <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane> | 13 | <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane> |
10 | <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane> | 14 | <el-tab-pane label="附件材料" name="fjcl"> |
15 | <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> | ||
11 | </el-tabs> | 16 | </el-tabs> |
12 | <!-- </div> --> | 17 | <!-- </div> --> |
13 | </template> | 18 | </template> |
... | @@ -20,6 +25,7 @@ import jzx from "./jzx"; | ... | @@ -20,6 +25,7 @@ import jzx from "./jzx"; |
20 | import djb from "./djb"; | 25 | import djb from "./djb"; |
21 | import lshs from "./lshs"; | 26 | import lshs from "./lshs"; |
22 | import fjcl from "./fjcl/fjcl" | 27 | import fjcl from "./fjcl/fjcl" |
28 | import {queryStatus} from "@api/search" | ||
23 | export default { | 29 | export default { |
24 | name: "", | 30 | name: "", |
25 | components: { | 31 | components: { |
... | @@ -28,6 +34,7 @@ export default { | ... | @@ -28,6 +34,7 @@ export default { |
28 | props: {}, | 34 | props: {}, |
29 | data() { | 35 | data() { |
30 | return { | 36 | return { |
37 | isDisabled:false, | ||
31 | activeName: "djdcb", | 38 | activeName: "djdcb", |
32 | mjftbVisible:false, | 39 | mjftbVisible:false, |
33 | jzdVisible:false, | 40 | jzdVisible:false, |
... | @@ -38,8 +45,23 @@ export default { | ... | @@ -38,8 +45,23 @@ export default { |
38 | }; | 45 | }; |
39 | }, | 46 | }, |
40 | methods: { | 47 | methods: { |
48 | loadingStatus() { | ||
49 | console.log("是否禁用") | ||
50 | let bsm=this.$route.query.bsm; | ||
51 | queryStatus(bsm).then(res => { | ||
52 | if (res.success) { | ||
53 | let qszt = res.result.qszt; | ||
54 | this.isDisabled = +qszt !== 0; | ||
55 | } | ||
56 | }) | ||
57 | }, | ||
58 | /* loading(){ | ||
59 | console.log("附件材料是否禁用") | ||
60 | this.$refs.fjcl.isUpload(this.$store.state.zdbsm) | ||
61 | },*/ | ||
41 | handleClick(tab, event) { | 62 | handleClick(tab, event) { |
42 | // console.log(tab, event); | 63 | // console.log(tab, event); |
64 | this.loadingStatus(); | ||
43 | switch (tab.name) { | 65 | switch (tab.name) { |
44 | case 'mjftb': | 66 | case 'mjftb': |
45 | this.mjftbVisible = true; | 67 | this.mjftbVisible = true; |
... | @@ -59,7 +81,7 @@ export default { | ... | @@ -59,7 +81,7 @@ export default { |
59 | case 'fjcl': | 81 | case 'fjcl': |
60 | this.fjclVisible = true; | 82 | this.fjclVisible = true; |
61 | break; | 83 | break; |
62 | 84 | ||
63 | default: | 85 | default: |
64 | break; | 86 | break; |
65 | } | 87 | } |
... | @@ -67,8 +89,16 @@ export default { | ... | @@ -67,8 +89,16 @@ export default { |
67 | }, | 89 | }, |
68 | created() {}, | 90 | created() {}, |
69 | mounted() {}, | 91 | mounted() {}, |
70 | computed: {}, | 92 | computed: { |
71 | watch: {}, | 93 | zdbsm() { |
94 | return this.$route.query.bsm; | ||
95 | }, | ||
96 | }, | ||
97 | watch: { | ||
98 | zdbsm: function (val) { | ||
99 | this.loadingStatus(); | ||
100 | }, | ||
101 | }, | ||
72 | }; | 102 | }; |
73 | </script> | 103 | </script> |
74 | <style scoped lang="less"> | 104 | <style scoped lang="less"> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main"> | 2 | <div class="main"> |
3 | <div class="button"> | 3 | <div class="button"> |
4 | <el-button type="primary" @click="oneExit">编辑</el-button> | 4 | <el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button> |
5 | <el-button type="primary" @click="save">保存</el-button> | 5 | <el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button> |
6 | <el-button type="primary" @click="batchExit">批量修改</el-button> | 6 | <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button> |
7 | </div> | 7 | </div> |
8 | <div class="table"> | 8 | <div class="table"> |
9 | <table border="1"> | 9 | <table border="1"> |
10 | <tr> | 10 | <tr> |
11 | <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td> | 11 | <th class="cz"> |
12 | <td class="jzdh">界址点号</td> | 12 | <el-checkbox @change="allcheck" v-model="isCheckAll"></el-checkbox> |
13 | <td class="sxh">顺序号</td> | 13 | </th> |
14 | <td class="xzbz">X坐标值</td> | 14 | <th class="">界址点号</th> |
15 | <td class="yzbz">Y坐标值</td> | 15 | <th class="">顺序号</th> |
16 | <td class="jblx">界标类型</td> | 16 | <th class="">X坐标值</th> |
17 | <td class="jzdlx">界址点类型</td> | 17 | <th class="">Y坐标值</th> |
18 | <th class="">界标类型</th> | ||
19 | <th class="">界址点类型</th> | ||
18 | </tr> | 20 | </tr> |
19 | <tr v-if="jzdlist.length==0"> | 21 | <tr v-if="jzdlist.length===0"> |
20 | <td colspan="7"><span class="nodata">暂无数据</span></td> | 22 | <td colspan="7"><span class="nodata">暂无数据</span></td> |
21 | </tr> | 23 | </tr> |
22 | <tr v-for="(item,index) in jzdlist" :key="index" v-else> | 24 | <tr v-for="(item,index) in jzdlist" :key="index" v-else> |
23 | <td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td> | 25 | <td class="cz"> |
24 | <td class="jzdh"><input type="text" class="formInput" v-model="item.jzdh" readonly="readonly"/></td> | 26 | <el-checkbox v-model="item.isCheck" @change="changeAll"></el-checkbox> |
25 | <td class="sxh"><input type="text" class="formInput" v-model="item.sxh" readonly="readonly"/></td> | 27 | </td> |
26 | <td class="xzbz"><input type="text" class="formInput" v-model="item.xzbz" :readonly="item.iszb" | 28 | <td class="jzdh"> |
27 | @keydown="oninput"/></td> | 29 | <el-input v-model="item.jzdh" readonly></el-input> |
28 | <td class="yzbz"><input tepe="text" class="formInput" v-model="item.yzbz" :readonly="item.iszb" | 30 | </td> |
29 | @keydown="oninput"/></td> | 31 | <td class="sxh"> |
32 | <el-input class="" v-model="item.sxh" readonly></el-input> | ||
33 | </td> | ||
34 | <td class="xzbz"> | ||
35 | <el-input class="" v-model="item.xzbz" :readonly="item.iszb" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | ||
36 | @keydown="oninput"></el-input> | ||
37 | </td> | ||
38 | <td class="yzbz"> | ||
39 | <el-input class="" v-model="item.yzbz" :readonly="item.iszb" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | ||
40 | @keydown="oninput"></el-input> | ||
41 | </td> | ||
30 | <td class="jblx"> | 42 | <td class="jblx"> |
31 | <el-select v-model="item.jblx" :disabled="item.jzdisdisabled"> | 43 | <el-select v-model="item.jblx" :disabled="item.jzdisdisabled"> |
32 | <el-option | 44 | <el-option |
... | @@ -52,9 +64,9 @@ | ... | @@ -52,9 +64,9 @@ |
52 | </div> | 64 | </div> |
53 | <div> | 65 | <div> |
54 | <el-dialog v-dialogDrag :close-on-click-modal="false" | 66 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
55 | title="批量修改" | 67 | title="批量修改" |
56 | :visible.sync="centerDialogVisible" | 68 | :visible.sync="centerDialogVisible" |
57 | width="30%" | 69 | width="30%" |
58 | > | 70 | > |
59 | <div class="plxg"> | 71 | <div class="plxg"> |
60 | <table> | 72 | <table> |
... | @@ -97,12 +109,18 @@ | ... | @@ -97,12 +109,18 @@ |
97 | 109 | ||
98 | <script> | 110 | <script> |
99 | import {queryjzd, jzdsingleModify, jzdbatchModify} from '@api/zd' | 111 | import {queryjzd, jzdsingleModify, jzdbatchModify} from '@api/zd' |
112 | import {queryStatus} from "@api/search" | ||
100 | import {Message} from 'element-ui' | 113 | import {Message} from 'element-ui' |
101 | 114 | ||
102 | export default { | 115 | export default { |
103 | name: "jzd", | 116 | name: "jzd", |
104 | components: {}, | 117 | components: {}, |
105 | props: {}, | 118 | props: { |
119 | isDisabled:{ | ||
120 | type:Boolean, | ||
121 | default:false | ||
122 | } | ||
123 | }, | ||
106 | data() { | 124 | data() { |
107 | return { | 125 | return { |
108 | bsm: '', | 126 | bsm: '', |
... | @@ -191,7 +209,7 @@ | ... | @@ -191,7 +209,7 @@ |
191 | }) | 209 | }) |
192 | }, | 210 | }, |
193 | save() { | 211 | save() { |
194 | if(this.jzdlist.length === 0){ | 212 | if (this.jzdlist.length === 0) { |
195 | Message.info("至少填写一条界址点信息") | 213 | Message.info("至少填写一条界址点信息") |
196 | return | 214 | return |
197 | } | 215 | } |
... | @@ -215,7 +233,7 @@ | ... | @@ -215,7 +233,7 @@ |
215 | e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null | 233 | e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null |
216 | }, | 234 | }, |
217 | changeAll(e) { | 235 | changeAll(e) { |
218 | if (!e.target.checked) { | 236 | if (!e) { |
219 | this.isCheckAll = false; | 237 | this.isCheckAll = false; |
220 | return | 238 | return |
221 | } | 239 | } |
... | @@ -229,7 +247,7 @@ | ... | @@ -229,7 +247,7 @@ |
229 | }, | 247 | }, |
230 | allcheck(value) { | 248 | allcheck(value) { |
231 | for (let item of this.jzdlist) { | 249 | for (let item of this.jzdlist) { |
232 | item.isCheck = value.target.checked; | 250 | item.isCheck = value; |
233 | } | 251 | } |
234 | }, | 252 | }, |
235 | oneExit() { | 253 | oneExit() { |
... | @@ -294,6 +312,7 @@ | ... | @@ -294,6 +312,7 @@ |
294 | height: auto; | 312 | height: auto; |
295 | width: 100%; | 313 | width: 100%; |
296 | .header-button { | 314 | .header-button { |
315 | z-index: 3; | ||
297 | height: 50px; | 316 | height: 50px; |
298 | position: fixed; | 317 | position: fixed; |
299 | bottom: 0; | 318 | bottom: 0; |
... | @@ -315,18 +334,10 @@ | ... | @@ -315,18 +334,10 @@ |
315 | background-color: #fff; | 334 | background-color: #fff; |
316 | font-size: 14px; | 335 | font-size: 14px; |
317 | width: 100%; | 336 | width: 100%; |
318 | .formInput { | ||
319 | margin: 0; | ||
320 | height: 36px; | ||
321 | outline: none; | ||
322 | border: none; | ||
323 | color: #606764; | ||
324 | overflow: visible; | ||
325 | text-align: center; | ||
326 | cursor: text; | ||
327 | } | ||
328 | } | 337 | } |
329 | 338 | th{ | |
339 | height: 36px; | ||
340 | } | ||
330 | td { | 341 | td { |
331 | text-align: center; | 342 | text-align: center; |
332 | height: 36px; | 343 | height: 36px; |
... | @@ -336,9 +347,9 @@ | ... | @@ -336,9 +347,9 @@ |
336 | cursor: pointer; | 347 | cursor: pointer; |
337 | } | 348 | } |
338 | .plxg { | 349 | .plxg { |
339 | .el-select{ | 350 | .el-select { |
340 | float: left; | 351 | float: left; |
341 | } | 352 | } |
342 | } | 353 | } |
343 | .batchlx { | 354 | .batchlx { |
344 | text-align: center; | 355 | text-align: center; |
... | @@ -348,11 +359,12 @@ | ... | @@ -348,11 +359,12 @@ |
348 | color: #b2b2b2; | 359 | color: #b2b2b2; |
349 | } | 360 | } |
350 | } | 361 | } |
351 | |||
352 | .cz { | 362 | .cz { |
353 | width: 50px; | 363 | width: 50px; |
354 | } | 364 | } |
355 | 365 | ||
366 | /* | ||
367 | |||
356 | .jzdh { | 368 | .jzdh { |
357 | width: 120px; | 369 | width: 120px; |
358 | } | 370 | } |
... | @@ -375,7 +387,7 @@ | ... | @@ -375,7 +387,7 @@ |
375 | 387 | ||
376 | .jzdlx { | 388 | .jzdlx { |
377 | width: 180px | 389 | width: 180px |
378 | } | 390 | }*/ |
379 | 391 | ||
380 | .dialog-footer { | 392 | .dialog-footer { |
381 | text-align: center; | 393 | text-align: center; | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main"> | 2 | <div class="main"> |
3 | <div class="button"> | 3 | <div class="button"> |
4 | <el-button type="primary" @click="oneExit">编辑</el-button> | 4 | <el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button> |
5 | <el-button type="primary" @click="save">保存</el-button> | 5 | <el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button> |
6 | <el-button type="primary" @click="batchExit">批量修改</el-button> | 6 | <el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button> |
7 | </div> | 7 | </div> |
8 | <div class="table"> | 8 | <div class="table"> |
9 | <table border="1"> | 9 | <table border="1"> |
10 | <tr> | 10 | <tr> |
11 | <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td> | 11 | <th class="cz"> |
12 | <td class="qdh">起始点号</td> | 12 | <el-checkbox @change="allcheck" v-model="isCheckAll"></el-checkbox> |
13 | <td class="zdh">终止点号</td> | 13 | </th> |
14 | <td class="jzjj">界址间距(m)</td> | 14 | <th class="">起始点号</th> |
15 | <td class="jzxlx">界址线类型</td> | 15 | <th class="">终止点号</th> |
16 | <td class="jzxwz">界址线位置</td> | 16 | <th class="">界址间距(m)</th> |
17 | <td class="jxxz">界限性质</td> | 17 | <th class="">界址线类型</th> |
18 | <td class="sm">说明</td> | 18 | <th class="">界址线位置</th> |
19 | <th class="">界限性质</th> | ||
20 | <th class="">说明</th> | ||
19 | </tr> | 21 | </tr> |
20 | <tr v-if="jzxlist.length==0"> | 22 | <tr v-if="jzxlist.length===0"> |
21 | <td colspan="8"><span class="nodata">暂无数据</span></td> | 23 | <td colspan="8"><span class="nodata">暂无数据</span></td> |
22 | </tr> | 24 | </tr> |
23 | <tr v-for="(item,index) in jzxlist" :key="index" v-else> | 25 | <tr v-for="(item,index) in jzxlist" :key="index" v-else> |
24 | <td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td> | 26 | <td class=""> |
25 | <td class="qsd"><input type="text" class="formInput" v-model="item.qdh" readonly="readonly"/></td> | 27 | <el-checkbox v-model="item.isCheck" @change="changeAll"></el-checkbox> |
26 | <td class="zzd"><input type="text" class="formInput" v-model="item.zdh" readonly="readonly"/></td> | 28 | </td> |
27 | <td class="jzdj"><input type="text" class="formInput" v-model="item.jzjj" | 29 | <td class=""> |
28 | :readonly="item.jjisdisabled"/></td> | 30 | <el-input v-model="item.qdh" readonly="readonly"></el-input> |
29 | <td class="jzxlx"> | 31 | </td> |
32 | <td class=""> | ||
33 | <el-input v-model="item.zdh" readonly="readonly"></el-input> | ||
34 | </td> | ||
35 | <td class=""> | ||
36 | <el-input v-model="item.jzjj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | ||
37 | :readonly="item.jjisdisabled"></el-input> | ||
38 | </td> | ||
39 | <td class=""> | ||
30 | <el-select v-model="item.jzxlb" :disabled="item.jzxisdisabled"> | 40 | <el-select v-model="item.jzxlb" :disabled="item.jzxisdisabled"> |
31 | <el-option | 41 | <el-option |
32 | v-for="i in jzxlx" | 42 | v-for="i in jzxlx" |
... | @@ -36,7 +46,7 @@ | ... | @@ -36,7 +46,7 @@ |
36 | ></el-option> | 46 | ></el-option> |
37 | </el-select> | 47 | </el-select> |
38 | </td> | 48 | </td> |
39 | <td class="jzxwz"> | 49 | <td class=""> |
40 | <el-select v-model="item.jzxwz" :disabled="item.jzxisdisabled"> | 50 | <el-select v-model="item.jzxwz" :disabled="item.jzxisdisabled"> |
41 | <el-option | 51 | <el-option |
42 | v-for="i in jzxwz" | 52 | v-for="i in jzxwz" |
... | @@ -46,7 +56,7 @@ | ... | @@ -46,7 +56,7 @@ |
46 | ></el-option> | 56 | ></el-option> |
47 | </el-select> | 57 | </el-select> |
48 | </td> | 58 | </td> |
49 | <td class="jxxz"> | 59 | <td class=""> |
50 | <el-select v-model="item.jxxz" :disabled="item.jzxisdisabled"> | 60 | <el-select v-model="item.jxxz" :disabled="item.jzxisdisabled"> |
51 | <el-option | 61 | <el-option |
52 | v-for="i in jxxz" | 62 | v-for="i in jxxz" |
... | @@ -56,17 +66,17 @@ | ... | @@ -56,17 +66,17 @@ |
56 | ></el-option> | 66 | ></el-option> |
57 | </el-select> | 67 | </el-select> |
58 | </td> | 68 | </td> |
59 | <td class="sm"> | 69 | <td class=""> |
60 | <input type="text" class="formInput" v-model="item.sm" readonly="readonly"/> | 70 | <el-input v-model="item.sm" readonly="readonly"></el-input> |
61 | </td> | 71 | </td> |
62 | </tr> | 72 | </tr> |
63 | </table> | 73 | </table> |
64 | </div> | 74 | </div> |
65 | <div> | 75 | <div> |
66 | <el-dialog v-dialogDrag :close-on-click-modal="false" | 76 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
67 | title="批量修改" | 77 | title="批量修改" |
68 | :visible.sync="centerDialogVisible" | 78 | :visible.sync="centerDialogVisible" |
69 | width="30%" | 79 | width="30%" |
70 | > | 80 | > |
71 | <div class="plxg"> | 81 | <div class="plxg"> |
72 | <table> | 82 | <table> |
... | @@ -127,7 +137,12 @@ | ... | @@ -127,7 +137,12 @@ |
127 | export default { | 137 | export default { |
128 | name: "jzx", | 138 | name: "jzx", |
129 | components: {}, | 139 | components: {}, |
130 | props: {}, | 140 | props: { |
141 | isDisabled:{ | ||
142 | type:Boolean, | ||
143 | default:false | ||
144 | } | ||
145 | }, | ||
131 | data() { | 146 | data() { |
132 | return { | 147 | return { |
133 | bsm: '', | 148 | bsm: '', |
... | @@ -236,13 +251,13 @@ | ... | @@ -236,13 +251,13 @@ |
236 | } | 251 | } |
237 | }, | 252 | }, |
238 | created() { | 253 | created() { |
239 | 254 | let bsm = this.$store.state.zdbsm; | |
240 | }, | ||
241 | mounted() { | ||
242 | let bsm = this.$store.state.zdbsm | ||
243 | this.bsm = bsm; | 255 | this.bsm = bsm; |
244 | this.getData(bsm) | 256 | this.getData(bsm) |
245 | }, | 257 | }, |
258 | mounted() { | ||
259 | |||
260 | }, | ||
246 | methods: { | 261 | methods: { |
247 | result() { | 262 | result() { |
248 | this.batchJzx.jzxlx = ''; | 263 | this.batchJzx.jzxlx = ''; |
... | @@ -261,7 +276,7 @@ | ... | @@ -261,7 +276,7 @@ |
261 | }) | 276 | }) |
262 | }, | 277 | }, |
263 | save() { | 278 | save() { |
264 | if(this.jzxlist.length === 0){ | 279 | if (this.jzxlist.length === 0) { |
265 | Message.info("至少填写一条界址线信息") | 280 | Message.info("至少填写一条界址线信息") |
266 | return | 281 | return |
267 | } | 282 | } |
... | @@ -284,7 +299,8 @@ | ... | @@ -284,7 +299,8 @@ |
284 | e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null | 299 | e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null |
285 | }, | 300 | }, |
286 | changeAll(e) { | 301 | changeAll(e) { |
287 | if (!e.target.checked) { | 302 | console.log(e,"单选") |
303 | if (!e) { | ||
288 | this.isCheckAll = false; | 304 | this.isCheckAll = false; |
289 | return | 305 | return |
290 | } | 306 | } |
... | @@ -297,8 +313,9 @@ | ... | @@ -297,8 +313,9 @@ |
297 | this.isCheckAll = true; | 313 | this.isCheckAll = true; |
298 | }, | 314 | }, |
299 | allcheck(value) { | 315 | allcheck(value) { |
316 | console.log(value,'全选') | ||
300 | for (let item of this.jzxlist) { | 317 | for (let item of this.jzxlist) { |
301 | item.isCheck = value.target.checked; | 318 | item.isCheck = value; |
302 | } | 319 | } |
303 | }, | 320 | }, |
304 | oneExit() { | 321 | oneExit() { |
... | @@ -368,20 +385,13 @@ | ... | @@ -368,20 +385,13 @@ |
368 | background-color: #fff; | 385 | background-color: #fff; |
369 | font-size: 14px; | 386 | font-size: 14px; |
370 | width: 100%; | 387 | width: 100%; |
371 | .formInput { | ||
372 | margin: 0; | ||
373 | height: 36px; | ||
374 | outline: none; | ||
375 | border: none; | ||
376 | color: #606764; | ||
377 | overflow: visible; | ||
378 | text-align: center; | ||
379 | cursor: text; | ||
380 | } | ||
381 | } | 388 | } |
382 | table:hover { | 389 | table:hover { |
383 | cursor: pointer; | 390 | cursor: pointer; |
384 | } | 391 | } |
392 | th { | ||
393 | height: 36px; | ||
394 | } | ||
385 | td { | 395 | td { |
386 | text-align: center; | 396 | text-align: center; |
387 | height: 36px; | 397 | height: 36px; |
... | @@ -401,29 +411,31 @@ | ... | @@ -401,29 +411,31 @@ |
401 | width: 50px; | 411 | width: 50px; |
402 | } | 412 | } |
403 | 413 | ||
404 | .qsd { | 414 | /* |
405 | width: 150px; | ||
406 | } | ||
407 | 415 | ||
408 | .zzd { | 416 | .qsd { |
409 | width: 150px; | 417 | width: 150px; |
410 | } | 418 | } |
411 | 419 | ||
412 | .jzdj { | 420 | .zzd { |
413 | width: 150px; | 421 | width: 150px; |
414 | } | 422 | } |
415 | 423 | ||
416 | .jzxlx { | 424 | .jzdj { |
417 | width: 180px; | 425 | width: 150px; |
418 | } | 426 | } |
419 | 427 | ||
420 | .jzxwz { | 428 | .jzxlx { |
421 | width: 150px; | 429 | width: 180px; |
422 | } | 430 | } |
423 | 431 | ||
424 | .jxxz { | 432 | .jzxwz { |
425 | width: 150px; | 433 | width: 150px; |
426 | } | 434 | } |
435 | |||
436 | .jxxz { | ||
437 | width: 150px; | ||
438 | }*/ | ||
427 | 439 | ||
428 | .sm { | 440 | .sm { |
429 | width: 150px; | 441 | width: 150px; |
... | @@ -433,8 +445,9 @@ | ... | @@ -433,8 +445,9 @@ |
433 | text-align: center; | 445 | text-align: center; |
434 | margin-top: 20px; | 446 | margin-top: 20px; |
435 | } | 447 | } |
436 | .plxg{ | 448 | |
437 | .el-select{ | 449 | .plxg { |
450 | .el-select { | ||
438 | float: left; | 451 | float: left; |
439 | } | 452 | } |
440 | } | 453 | } | ... | ... |
... | @@ -2,22 +2,23 @@ | ... | @@ -2,22 +2,23 @@ |
2 | <div class="main" ref="mainBox"> | 2 | <div class="main" ref="mainBox"> |
3 | <table border="1"> | 3 | <table border="1"> |
4 | <tr> | 4 | <tr> |
5 | <td colspan="2">土地坐落</td> | 5 | <th colspan="2">土地坐落</th> |
6 | <td colspan="3"><input type="text" class="formInput" v-model="tdzl" disabled/></td> | 6 | <th colspan="3"><el-input v-model="tdzl" disabled></el-input></th> |
7 | </tr> | 7 | </tr> |
8 | <tr> | 8 | <tr> |
9 | <td colspan="2">宗地代码</td> | 9 | <th colspan="2">宗地代码</th> |
10 | <td colspan="3"><input type="text" class="formInput" v-model="zddm " disabled/></td> | 10 | <td colspan="3"><el-input v-model="zddm " disabled></el-input></td> |
11 | </tr> | 11 | </tr> |
12 | <tr> | 12 | <tr> |
13 | <td colspan="2">宗地面积(㎡)</td> | 13 | <th colspan="2">宗地面积(㎡)</th> |
14 | <td><input type="number" class="formInput" v-model.number="zdmj" disabled/></td> | 14 | <th> |
15 | <td>定着物数量</td> | 15 | <el-input v-model="zdmj" disabled/></th> |
16 | <th>定着物数量</th> | ||
16 | <td class="dzwsl">{{dzwdsl}}</td> | 17 | <td class="dzwsl">{{dzwdsl}}</td> |
17 | </tr> | 18 | </tr> |
18 | <tr> | 19 | <tr> |
19 | <td colspan="2">备注</td> | 20 | <th colspan="2">备注</th> |
20 | <td colspan="3"><input type="text" class="formInput" v-model="mjftData.bz"/></td> | 21 | <td colspan="3"><el-input v-model="mjftData.bz" :disabled="isDisabled"></el-input></td> |
21 | </tr> | 22 | </tr> |
22 | </table> | 23 | </table> |
23 | <table border="1"> | 24 | <table border="1"> |
... | @@ -26,12 +27,13 @@ | ... | @@ -26,12 +27,13 @@ |
26 | type="primary" | 27 | type="primary" |
27 | class="changeBtn inAdd addMinus" | 28 | class="changeBtn inAdd addMinus" |
28 | @click="addRow" | 29 | @click="addRow" |
30 | :disabled="isDisabled" | ||
29 | >+</el-button | 31 | >+</el-button |
30 | ></td> | 32 | ></td> |
31 | <td class="dzwdm">定着物代码</td> | 33 | <th class="dzwdm">定着物代码</th> |
32 | <td class="syqmj">土地所有权/使用权面积(㎡)</td> | 34 | <th class="syqmj">土地所有权/使用权面积(㎡)</th> |
33 | <td class="dytdmj">独有独用土地面积(㎡)</td> | 35 | <th class="dytdmj">独有独用土地面积(㎡)</th> |
34 | <td class="fttjmj">分摊土地面积(㎡)</td> | 36 | <th class="fttjmj">分摊土地面积(㎡)</th> |
35 | </tr> | 37 | </tr> |
36 | <tr v-for="(item,i) in mjftData.list" :key="i"> | 38 | <tr v-for="(item,i) in mjftData.list" :key="i"> |
37 | <td class="cz"> | 39 | <td class="cz"> |
... | @@ -39,42 +41,40 @@ | ... | @@ -39,42 +41,40 @@ |
39 | type="primary" | 41 | type="primary" |
40 | class="changeBtn inMinus addMinus" | 42 | class="changeBtn inMinus addMinus" |
41 | @click="delRow(i)" | 43 | @click="delRow(i)" |
44 | :disabled="isDisabled" | ||
42 | >-</el-button | 45 | >-</el-button |
43 | > | 46 | > |
44 | </td> | 47 | </td> |
45 | <td class="dzwdm"> | 48 | <td class="dzwdm"> |
46 | <el-input v-model="item.dzwdm" | 49 | <el-input v-model="item.dzwdm" |
47 | maxlength="9" | 50 | maxlength="9" |
51 | :disabled="isDisabled" | ||
48 | > | 52 | > |
49 | </el-input> | 53 | </el-input> |
50 | </td> | 54 | </td> |
51 | <td class="syqmj"> | 55 | <td class="syqmj"> |
52 | <el-input style="ime-mode:inactive" | 56 | <el-input style="ime-mode:inactive" |
53 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 57 | oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null" |
54 | v-model="item.tdsyqsyqmj" | 58 | v-model="item.tdsyqsyqmj" :disabled="isDisabled" |
55 | ></el-input> | 59 | ></el-input> |
56 | </td> | 60 | </td> |
57 | <td class="dytdmj"> | 61 | <td class="dytdmj"> |
58 | <el-input v-model="item.dydytdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> | 62 | <el-input v-model="item.dydytdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"></el-input> |
59 | </td> | 63 | </td> |
60 | <td class="fttjmj"> | 64 | <td class="fttjmj"> |
61 | <el-input v-model="item.fttdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> | 65 | <el-input v-model="item.fttdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"></el-input> |
62 | </td> | 66 | </td> |
63 | </tr> | 67 | </tr> |
64 | <tr> | 68 | <tr> |
65 | <td class="cz"></td> | 69 | <td class="cz"></td> |
66 | <td class="dzwdm">统计</td> | 70 | <th class="dzwdm">统计</th> |
67 | <td class="syqmj">{{sumTdsyqsyqmj}}</td> | 71 | <td class="syqmj">{{sumTdsyqsyqmj}}</td> |
68 | <td class="dytdmj">{{sumDydytdmj}}</td> | 72 | <td class="dytdmj">{{sumDydytdmj}}</td> |
69 | <td class="fttjmj">{{sumFttdmj}}</td> | 73 | <td class="fttjmj">{{sumFttdmj}}</td> |
70 | </tr> | 74 | </tr> |
71 | </table> | 75 | </table> |
72 | <!-- <div class="pers"> | ||
73 | <el-button @click="save" type="primary">保存</el-button> | ||
74 | </div> --> | ||
75 | |||
76 | <div class="header-button" :style="{width:mainBoxWidth+'px'}"> | 76 | <div class="header-button" :style="{width:mainBoxWidth+'px'}"> |
77 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> | 77 | <el-button type="primary" class="saveBtn" @click="save" :disabled="isDisabled">保存</el-button> |
78 | </div> | 78 | </div> |
79 | </div> | 79 | </div> |
80 | </template> | 80 | </template> |
... | @@ -85,6 +85,12 @@ | ... | @@ -85,6 +85,12 @@ |
85 | 85 | ||
86 | export default { | 86 | export default { |
87 | name: "index", | 87 | name: "index", |
88 | props: { | ||
89 | isDisabled:{ | ||
90 | type:Boolean, | ||
91 | default:false | ||
92 | } | ||
93 | }, | ||
88 | data() { | 94 | data() { |
89 | return { | 95 | return { |
90 | tdzl: '', // 土地坐落 继承获取 | 96 | tdzl: '', // 土地坐落 继承获取 |
... | @@ -203,7 +209,10 @@ | ... | @@ -203,7 +209,10 @@ |
203 | let num = this.mjftData.list.length ? this.mjftData.list.length : 0 | 209 | let num = this.mjftData.list.length ? this.mjftData.list.length : 0 |
204 | self.mjftData.dzwdys = num | 210 | self.mjftData.dzwdys = num |
205 | return num; | 211 | return num; |
206 | } | 212 | }, |
213 | zdbsm() { | ||
214 | return this.$route.query.bsm; | ||
215 | }, | ||
207 | }, | 216 | }, |
208 | created() { | 217 | created() { |
209 | console.log("create init...") | 218 | console.log("create init...") |
... | @@ -233,6 +242,9 @@ | ... | @@ -233,6 +242,9 @@ |
233 | "$store.state.zddm": function (zddm) { | 242 | "$store.state.zddm": function (zddm) { |
234 | this.zddm = zddm | 243 | this.zddm = zddm |
235 | }, | 244 | }, |
245 | zdbsm: function (val) { | ||
246 | this.getData(val); | ||
247 | }, | ||
236 | } | 248 | } |
237 | } | 249 | } |
238 | </script> | 250 | </script> |
... | @@ -250,16 +262,6 @@ | ... | @@ -250,16 +262,6 @@ |
250 | font-size: 14px; | 262 | font-size: 14px; |
251 | width: 100%; | 263 | width: 100%; |
252 | cursor: pointer; | 264 | cursor: pointer; |
253 | .formInput { | ||
254 | margin: 0; | ||
255 | height: 36px; | ||
256 | outline: none; | ||
257 | border: none; | ||
258 | color: #606764; | ||
259 | overflow: visible; | ||
260 | text-align: center; | ||
261 | cursor: text; | ||
262 | } | ||
263 | td { | 265 | td { |
264 | text-align: center; | 266 | text-align: center; |
265 | height: 36px; | 267 | height: 36px; |
... | @@ -267,6 +269,7 @@ | ... | @@ -267,6 +269,7 @@ |
267 | } | 269 | } |
268 | } | 270 | } |
269 | .header-button { | 271 | .header-button { |
272 | z-index: 3; | ||
270 | height: 50px; | 273 | height: 50px; |
271 | position: fixed; | 274 | position: fixed; |
272 | bottom: 0; | 275 | bottom: 0; |
... | @@ -302,11 +305,11 @@ | ... | @@ -302,11 +305,11 @@ |
302 | width: 50px; | 305 | width: 50px; |
303 | } | 306 | } |
304 | 307 | ||
305 | .dzwdm { | 308 | .dzwdm ,.syqmj,.dytdmj,.fttjmj{ |
306 | width: 150px; | 309 | width: 150px; |
307 | } | 310 | } |
308 | 311 | ||
309 | .syqmj { | 312 | /* .syqmj { |
310 | width: 150px; | 313 | width: 150px; |
311 | } | 314 | } |
312 | 315 | ||
... | @@ -316,6 +319,6 @@ | ... | @@ -316,6 +319,6 @@ |
316 | 319 | ||
317 | .fttjmj { | 320 | .fttjmj { |
318 | width: 150px; | 321 | width: 150px; |
319 | } | 322 | }*/ |
320 | 323 | ||
321 | </style> | 324 | </style> | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -6,7 +6,7 @@ | ... | @@ -6,7 +6,7 @@ |
6 | <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> | 6 | <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> |
7 | <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane> | 7 | <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane> |
8 | <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> | 8 | <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> |
9 | <el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane> | 9 | <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> |
10 | </el-tabs> | 10 | </el-tabs> |
11 | </div> | 11 | </div> |
12 | </template> | 12 | </template> |
... | @@ -18,6 +18,7 @@ import djb from "./djb"; | ... | @@ -18,6 +18,7 @@ import djb from "./djb"; |
18 | import lpb from "./lpb"; | 18 | import lpb from "./lpb"; |
19 | import lshs from "./lshs"; | 19 | import lshs from "./lshs"; |
20 | import fjcl from "./../zd/fjcl/fjcl"; | 20 | import fjcl from "./../zd/fjcl/fjcl"; |
21 | import {queryStatus} from "@api/search" | ||
21 | export default { | 22 | export default { |
22 | name: "", | 23 | name: "", |
23 | components: { | 24 | components: { |
... | @@ -26,13 +27,25 @@ export default { | ... | @@ -26,13 +27,25 @@ export default { |
26 | props: {}, | 27 | props: {}, |
27 | data() { | 28 | data() { |
28 | return { | 29 | return { |
30 | isDisabled:false, | ||
29 | activeName: "zrzxx", | 31 | activeName: "zrzxx", |
30 | lpbLoad:false, //默认不加载楼盘表组件 | 32 | lpbLoad:false, //默认不加载楼盘表组件 |
31 | yzgyLoad:false, | 33 | yzgyLoad:false, |
32 | }; | 34 | }; |
33 | }, | 35 | }, |
34 | methods: { | 36 | methods: { |
37 | loadingStatus() { | ||
38 | console.log("是否禁用") | ||
39 | let bsm=this.$store.state.zrzbsm; | ||
40 | queryStatus(bsm).then(res => { | ||
41 | if (res.success) { | ||
42 | let qszt = res.result.qszt; | ||
43 | this.isDisabled = +qszt !== 0; | ||
44 | } | ||
45 | }) | ||
46 | }, | ||
35 | handleClick(tab, event) { | 47 | handleClick(tab, event) { |
48 | this.loadingStatus() | ||
36 | if(!this.lpbLoad){ | 49 | if(!this.lpbLoad){ |
37 | this.lpbLoad = tab.name == 'lpb' ? true : false | 50 | this.lpbLoad = tab.name == 'lpb' ? true : false |
38 | } | 51 | } | ... | ... |
... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
4 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> | 4 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> |
5 | <tbody> | 5 | <tbody> |
6 | <tr height="30"> | 6 | <tr height="30"> |
7 | <td colspan="12" align="center" ><font size="4">逻辑幢基本信息</font></td> | 7 | <td colspan="12" align="center" ><font size="4">层基本信息</font></td> |
8 | </tr> | 8 | </tr> |
9 | <tr height="30"> | 9 | <tr height="30"> |
10 | <td colspan="2" align="center" >层号</td> | 10 | <td colspan="2" align="center" >层号</td> |
... | @@ -77,19 +77,21 @@ | ... | @@ -77,19 +77,21 @@ |
77 | </tbody> | 77 | </tbody> |
78 | </table> | 78 | </table> |
79 | </el-form> | 79 | </el-form> |
80 | <div style="min-height: 40px;text-align: center;margin-top: 10px"> | ||
81 | <el-button type="success" @click="onSave">保存</el-button> | ||
82 | <el-button type="primary" @click="onSubmit">提交</el-button> | ||
83 | </div> | ||
84 | </div> | 80 | </div> |
85 | 81 | ||
86 | </template> | 82 | </template> |
87 | 83 | ||
88 | <script> | 84 | <script> |
89 | import {insertCInfo} from "@api/zrz"; | 85 | import {getQjCDetailById,updateQjC} from "@api/c"; |
90 | export default { | 86 | export default { |
91 | name:'c', | 87 | name:'c', |
92 | components:{}, | 88 | components:{}, |
89 | props: { | ||
90 | cbsm:{ | ||
91 | type: String, | ||
92 | default: '', | ||
93 | } | ||
94 | }, | ||
93 | data () { | 95 | data () { |
94 | return { | 96 | return { |
95 | form:{ | 97 | form:{ |
... | @@ -112,28 +114,65 @@ | ... | @@ -112,28 +114,65 @@ |
112 | }, | 114 | }, |
113 | methods: { | 115 | methods: { |
114 | onSave(){ | 116 | onSave(){ |
115 | this.form.zrzbsm=this.$router.query.bsm; | 117 | this.form.zrzbsm=this.$route.query.bsm; |
116 | insertCInfo(this.form).then((res)=>{ | 118 | //编辑层信息接口调用 TODO |
117 | if(res.code===200){ | 119 | updateQjC(this.form).then((res)=>{ |
120 | if(res.code === 200){ | ||
118 | this.$message.success("保存成功") | 121 | this.$message.success("保存成功") |
119 | } | 122 | } |
120 | }) | 123 | }) |
121 | console.log(this.form) | ||
122 | }, | 124 | }, |
123 | onSubmit(){ | 125 | getCinfo(bsm){ |
124 | console.log(this.form) | 126 | this.reset(); |
127 | //获取层信息接口调用 TODO | ||
128 | getQjCDetailById(bsm).then((res)=>{ | ||
129 | if(res.code === 200){ | ||
130 | this.form = res.result; | ||
131 | this.form.zrzh = this.$store.state.zrzh; | ||
132 | } | ||
133 | }) | ||
134 | |||
135 | }, | ||
136 | reset(){ | ||
137 | this.form = { | ||
138 | zrzbsm:'', | ||
139 | ch:'', //层号 | ||
140 | zrzh:'', //自然幢号 | ||
141 | sjc:'', //实际层 | ||
142 | myc:'', //名义层 | ||
143 | cjzmj:'', //层建筑面积 | ||
144 | ctnjzmj:'', //层套内建筑面积 | ||
145 | cytmj:'', //层阳台面积 | ||
146 | cbqmj:'', //层半墙面积 | ||
147 | cgyjzmj:'', //层共有建筑面积 | ||
148 | cftjzmj:'', //层分摊建筑面积 | ||
149 | cg:'', //层高 | ||
150 | sptymj:'', //水平投影面积 | ||
151 | } | ||
125 | } | 152 | } |
153 | }, | ||
154 | mounted(){ | ||
155 | this.getCinfo(this.cbsm); | ||
156 | }, | ||
157 | watch:{ | ||
158 | cbsm: { | ||
159 | handler: function (item) { | ||
160 | console.log(item,"item") | ||
161 | console.log(this.$parent.$parent.menuType,"this.$parent.$parent.menuType") | ||
162 | if(item!='' && this.$parent.$parent.menuType == 'c'){ | ||
163 | this.getCinfo(item) | ||
164 | } | ||
165 | }, | ||
166 | immediate: true | ||
167 | }, | ||
126 | } | 168 | } |
127 | } | 169 | } |
128 | </script> | 170 | </script> |
129 | <style rel="stylesheet/less" lang="less" scoped> | 171 | <style rel="stylesheet/less" lang="less" scoped> |
130 | .h { | 172 | .h { |
131 | min-height: 200px; | 173 | min-height: 200px; |
132 | width: 80%; | 174 | width: 100%; |
133 | margin-top: 10px; | 175 | margin: 0 auto; |
134 | margin-left: 10%; | ||
135 | float: left; | ||
136 | |||
137 | /deep/.el-input__inner{ | 176 | /deep/.el-input__inner{ |
138 | width: 100%; | 177 | width: 100%; |
139 | border: 0; | 178 | border: 0; | ... | ... |
... | @@ -9,33 +9,24 @@ | ... | @@ -9,33 +9,24 @@ |
9 | </template> | 9 | </template> |
10 | </el-table-column> | 10 | </el-table-column> |
11 | <el-table-column prop="zrzmc" label="自然幢" align="center"> | 11 | <el-table-column prop="zrzmc" label="自然幢" align="center"> |
12 | <!-- <template slot-scope="scope"> | ||
13 | <el-input size="small" v-model="scope.row.ljzbsm"></el-input> | ||
14 | </template> --> | ||
15 | </el-table-column> | 12 | </el-table-column> |
16 | <el-table-column prop="ljzmc" label="逻辑幢" align="center"> | 13 | <el-table-column prop="ljzmc" label="逻辑幢" align="center"> |
17 | <!-- <template slot-scope="scope"> | ||
18 | <el-input size="small" v-model="scope.row.ljzbsm"></el-input> | ||
19 | </template> --> | ||
20 | </el-table-column> | 14 | </el-table-column> |
21 | <el-table-column prop="zdymc" label="幢单元" align="center"> | 15 | <el-table-column prop="zdymc" label="幢单元" align="center"> |
22 | <!-- <template slot-scope="scope"> | ||
23 | <el-input size="small" v-model="scope.row.zdybsm"></el-input> | ||
24 | </template> --> | ||
25 | </el-table-column> | 16 | </el-table-column> |
26 | <el-table-column prop="qsc" label="起始层" align="center"> | 17 | <el-table-column prop="qsc" label="起始层" align="center"> |
27 | <template slot-scope="scope"> | 18 | <template slot-scope="scope"> |
28 | <el-input size="small" v-model="scope.row.qsc"></el-input> | 19 | <el-input v-model="scope.row.qsc" type="number"></el-input> |
29 | </template> | 20 | </template> |
30 | </el-table-column> | 21 | </el-table-column> |
31 | <el-table-column prop="jsc" label="结束层" align="center"> | 22 | <el-table-column prop="jsc" label="结束层" align="center"> |
32 | <template slot-scope="scope"> | 23 | <template slot-scope="scope"> |
33 | <el-input size="small" v-model="scope.row.jsc"></el-input> | 24 | <el-input v-model="scope.row.jsc" type="number"></el-input> |
34 | </template> | 25 | </template> |
35 | </el-table-column> | 26 | </el-table-column> |
36 | <el-table-column prop="hs" label="每层户数" align="center"> | 27 | <el-table-column prop="hs" label="每层户数" align="center"> |
37 | <template slot-scope="scope"> | 28 | <template slot-scope="scope"> |
38 | <el-input size="small" v-model="scope.row.hs"></el-input> | 29 | <el-input v-model="scope.row.hs" type="number"></el-input> |
39 | </template> | 30 | </template> |
40 | </el-table-column> | 31 | </el-table-column> |
41 | </el-table> | 32 | </el-table> |
... | @@ -87,6 +78,9 @@ export default { | ... | @@ -87,6 +78,9 @@ export default { |
87 | handleRowClick(row, index) { | 78 | handleRowClick(row, index) { |
88 | if (row.cz == "+") { | 79 | if (row.cz == "+") { |
89 | let temp = JSON.parse(JSON.stringify(this.formData)); | 80 | let temp = JSON.parse(JSON.stringify(this.formData)); |
81 | temp.qsc = ''; | ||
82 | temp.jsc = ''; | ||
83 | temp.hs = ''; | ||
90 | temp.cz = "-"; | 84 | temp.cz = "-"; |
91 | this.tableData.push(temp); | 85 | this.tableData.push(temp); |
92 | } else { | 86 | } else { |
... | @@ -94,6 +88,23 @@ export default { | ... | @@ -94,6 +88,23 @@ export default { |
94 | } | 88 | } |
95 | }, | 89 | }, |
96 | onSave(bsm) { | 90 | onSave(bsm) { |
91 | console.log(this.tableData) | ||
92 | let totalHs = 0; | ||
93 | for(let k =0;k<this.tableData.length;k++){ | ||
94 | if(this.tableData[k].qsc === ""||this.tableData[k].jsc === ""||this.tableData[k].hs === ""){ | ||
95 | this.$message.warning("表单不完整,请填写完整") | ||
96 | return false | ||
97 | } | ||
98 | if(this.tableData[k].qsc - this.tableData[k].jsc > 0){ | ||
99 | this.$message.warning("存在结束层大于起始层,请重写填写") | ||
100 | return false | ||
101 | } | ||
102 | totalHs = totalHs + (this.tableData[k].jsc-this.tableData[k].qsc+1)*this.tableData[k].hs; | ||
103 | } | ||
104 | if(totalHs >= 5000){ | ||
105 | this.$message.warning("单次添加户数累积超过5000户,请分次添加!") | ||
106 | return false | ||
107 | } | ||
97 | insertChInfo(this.tableData).then((res) => { | 108 | insertChInfo(this.tableData).then((res) => { |
98 | if (res.code === 200) { | 109 | if (res.code === 200) { |
99 | this.$message.success("保存成功"); | 110 | this.$message.success("保存成功"); | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | <div class="edit"> | 2 | <div class="edit"> |
3 | <div class="tab-header"> | 3 | <div class="tab-header"> |
4 | <el-row class="searchContent"> | 4 | <el-row class="searchContent"> |
5 | <el-col :span="6"> | 5 | <el-col :span="24" style="margin:0 0 10px 18px;"> |
6 | <el-radio-group v-model="scyclx" @change="scyclxChange"> | 6 | <el-radio-group v-model="scyclx" @change="scyclxChange"> |
7 | <el-radio-button label="0">预测</el-radio-button> | 7 | <el-radio-button label="0">预测</el-radio-button> |
8 | <el-radio-button label="1">实测</el-radio-button> | 8 | <el-radio-button label="1">实测</el-radio-button> |
... | @@ -11,9 +11,6 @@ | ... | @@ -11,9 +11,6 @@ |
11 | maxlength="28" | 11 | maxlength="28" |
12 | v-model="bdcdyh" | 12 | v-model="bdcdyh" |
13 | :style="{ width: inputWidth + 'px' }" | 13 | :style="{ width: inputWidth + 'px' }" |
14 | @focus="inputFocus" | ||
15 | @blur="inputBlur" | ||
16 | @change="inputChange" | ||
17 | class="searchInput" | 14 | class="searchInput" |
18 | placeholder="输入不动产单元号或室号" | 15 | placeholder="输入不动产单元号或室号" |
19 | ><i | 16 | ><i |
... | @@ -23,8 +20,10 @@ | ... | @@ -23,8 +20,10 @@ |
23 | ></i | 20 | ></i |
24 | ></el-input> | 21 | ></el-input> |
25 | </el-col> | 22 | </el-col> |
26 | <el-col :span="18"> | 23 | </el-row> |
27 | <div class="fr"> | 24 | <el-row class="searchContent"> |
25 | <el-col :span="24"> | ||
26 | <div class="fl"> | ||
28 | <el-button class="radioBtn" label="1" border @click="create" | 27 | <el-button class="radioBtn" label="1" border @click="create" |
29 | ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button | 28 | ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button |
30 | > | 29 | > |
... | @@ -82,12 +81,17 @@ | ... | @@ -82,12 +81,17 @@ |
82 | </div> | 81 | </div> |
83 | </el-col> | 82 | </el-col> |
84 | </el-row> | 83 | </el-row> |
84 | <div class="change"> | ||
85 | <i class="iconfont iconloupanbiaoxinxi" v-show="bjztFlag" @click="bjztChange" title="详细信息"></i> | ||
86 | <i class="iconfont iconloupanbiaobianji" v-show="!bjztFlag" @click="bjztChange" title="编辑楼盘"></i> | ||
87 | </div> | ||
85 | </div> | 88 | </div> |
86 | <div | 89 | <div |
87 | class="tab-content" | 90 | class="tab-content" |
88 | ref="tabContent" | 91 | ref="tabContent" |
89 | :style="{ height: lpbContentHight + 'px' }" | 92 | :style="{ height: lpbContentHight + 'px' }" |
90 | v-loading="lpbloading" | 93 | v-loading="lpbloading" |
94 | v-if="bjztFlag" | ||
91 | > | 95 | > |
92 | <!-- 左侧树结构 --> | 96 | <!-- 左侧树结构 --> |
93 | <div class="lp-tree" :class="createFlag ? 'w260' : 'w0'"> | 97 | <div class="lp-tree" :class="createFlag ? 'w260' : 'w0'"> |
... | @@ -222,15 +226,20 @@ | ... | @@ -222,15 +226,20 @@ |
222 | </div> | 226 | </div> |
223 | </div> | 227 | </div> |
224 | </div> | 228 | </div> |
229 | |||
230 | <xxxx v-if="!bjztFlag"></xxxx> | ||
225 | 231 | ||
226 | <!-- 右键菜单弹出框 --> | 232 | <!-- 右键菜单弹出框 --> |
227 | <el-dialog v-dialogDrag :close-on-click-modal="false" title="添加" :visible.sync="dialogVisible" width="50%" > | 233 | <el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%" > |
228 | <!-- 根据菜单类型(menuType)和右键点击的楼盘类型(treeData.type)来区分弹框内容 --> | 234 | <!-- 根据菜单类型(menuType)和右键点击的楼盘类型(treeData.type)来区分弹框内容 --> |
229 | <div class="addCh" v-show="menuType == 'ljz'"> | 235 | <div class="addCh" v-show="menuType == 'ljz'"> |
230 | <addLjz ref="ljz"></addLjz> | 236 | <addLjz ref="ljz" :ljzbsm="curBsm"></addLjz> |
231 | </div> | 237 | </div> |
232 | <div class="addCh" v-show="menuType == 'zdy'"> | 238 | <div class="addCh" v-show="menuType == 'zdy'"> |
233 | <addZdy ref="zdy"></addZdy> | 239 | <addZdy ref="zdy" :zdybsm="curBsm"></addZdy> |
240 | </div> | ||
241 | <div class="addCh" v-show="menuType == 'c'"> | ||
242 | <editCinfo ref="c" :cbsm="curBsm"></editCinfo> | ||
234 | </div> | 243 | </div> |
235 | <div class="addCh" v-show="menuType == 'ch'"> | 244 | <div class="addCh" v-show="menuType == 'ch'"> |
236 | <addCh | 245 | <addCh |
... | @@ -266,8 +275,10 @@ import LineTree from "@components/lineTree/lineTree"; | ... | @@ -266,8 +275,10 @@ import LineTree from "@components/lineTree/lineTree"; |
266 | import addLjz from "./ljz/index"; | 275 | import addLjz from "./ljz/index"; |
267 | import addZdy from "./zdy/index"; | 276 | import addZdy from "./zdy/index"; |
268 | import addCh from "./ch/index"; | 277 | import addCh from "./ch/index"; |
278 | import editCinfo from "./c/index"; | ||
269 | import lpbContent from "./lpbContent/index"; | 279 | import lpbContent from "./lpbContent/index"; |
270 | import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb"; | 280 | import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb"; |
281 | import xxxx from '../xxxx/index' | ||
271 | 282 | ||
272 | export default { | 283 | export default { |
273 | name: "", | 284 | name: "", |
... | @@ -281,6 +292,8 @@ export default { | ... | @@ -281,6 +292,8 @@ export default { |
281 | PlSh, | 292 | PlSh, |
282 | PlH, | 293 | PlH, |
283 | PlZl, | 294 | PlZl, |
295 | xxxx, | ||
296 | editCinfo | ||
284 | }, | 297 | }, |
285 | props: {}, | 298 | props: {}, |
286 | data() { | 299 | data() { |
... | @@ -300,7 +313,7 @@ export default { | ... | @@ -300,7 +313,7 @@ export default { |
300 | pd: [], //创建楼盘的树结构数据 | 313 | pd: [], //创建楼盘的树结构数据 |
301 | menuType: "", | 314 | menuType: "", |
302 | treeData: {}, | 315 | treeData: {}, |
303 | inputWidth: 74, | 316 | inputWidth: 200, |
304 | selectedZt: "dyzt", //图例选中项,默认选中单元状态 | 317 | selectedZt: "dyzt", //图例选中项,默认选中单元状态 |
305 | dyztList: [ | 318 | dyztList: [ |
306 | { | 319 | { |
... | @@ -367,6 +380,10 @@ export default { | ... | @@ -367,6 +380,10 @@ export default { |
367 | dyztBsmList: {}, //单元状态bsmList | 380 | dyztBsmList: {}, //单元状态bsmList |
368 | cbsmList:[], // 层bsmlist | 381 | cbsmList:[], // 层bsmlist |
369 | lpbloading:true, | 382 | lpbloading:true, |
383 | bjztFlag:true, | ||
384 | taskTitle:'添加', | ||
385 | curBsm:'', | ||
386 | qsztList:[], | ||
370 | }; | 387 | }; |
371 | }, | 388 | }, |
372 | created() { | 389 | created() { |
... | @@ -390,12 +407,20 @@ export default { | ... | @@ -390,12 +407,20 @@ export default { |
390 | if (this.bsms.length <= 0) { | 407 | if (this.bsms.length <= 0) { |
391 | Message.warning("请选择操作户") | 408 | Message.warning("请选择操作户") |
392 | return | 409 | return |
393 | } | 410 | }else{ |
394 | batchCommit(this.bsms).then(res=>{ | 411 | if (this.qsztList.indexOf('1') > -1) { |
395 | if (res.success) { | 412 | Message.warning("已提交的户无法继续操作") |
396 | Message.success("提交成功") | 413 | }else{ |
397 | } | 414 | batchCommit(this.bsms).then(res=>{ |
398 | }) | 415 | if(res.code === 200){ |
416 | Message.success("提交成功"); | ||
417 | this.getlpbData(); | ||
418 | }else { | ||
419 | this.$message.error(res.message); | ||
420 | } | ||
421 | }) | ||
422 | } | ||
423 | } | ||
399 | }, | 424 | }, |
400 | loading(){ | 425 | loading(){ |
401 | this.getLpbMenuTree(this.$store.state.zrzbsm); | 426 | this.getLpbMenuTree(this.$store.state.zrzbsm); |
... | @@ -411,23 +436,28 @@ export default { | ... | @@ -411,23 +436,28 @@ export default { |
411 | if (this.bsms.length <= 0) { | 436 | if (this.bsms.length <= 0) { |
412 | Message.warning("请选择操作户") | 437 | Message.warning("请选择操作户") |
413 | return | 438 | return |
414 | } | 439 | }else{ |
415 | switch (val) { | 440 | if (this.qsztList.indexOf('1') > -1) { |
416 | case 'h': | 441 | Message.warning("已提交的户无法继续操作") |
417 | this.plhVisible=true; | 442 | }else{ |
418 | break; | 443 | switch (val) { |
419 | case 'zl': | 444 | case 'h': |
420 | this.plzlVisible=true; | 445 | this.plhVisible=true; |
421 | break; | 446 | break; |
422 | case 'sh': | 447 | case 'zl': |
423 | this.plShVisible=true; | 448 | this.plzlVisible=true; |
424 | break; | 449 | break; |
425 | default: | 450 | case 'sh': |
426 | break; | 451 | this.plShVisible=true; |
427 | } | 452 | break; |
453 | default: | ||
454 | break; | ||
455 | } | ||
456 | } | ||
457 | } | ||
428 | }, | 458 | }, |
429 | lodding(){ | 459 | lodding(){ |
430 | this.getlpbData(); | 460 | this.getlpbData(); |
431 | }, | 461 | }, |
432 | plZlClose() { | 462 | plZlClose() { |
433 | this.plzlVisible = false; | 463 | this.plzlVisible = false; |
... | @@ -441,11 +471,16 @@ export default { | ... | @@ -441,11 +471,16 @@ export default { |
441 | plshClose() { | 471 | plshClose() { |
442 | this.plShVisible = false; | 472 | this.plShVisible = false; |
443 | }, | 473 | }, |
474 | //改变编辑或详细信息状态 | ||
475 | bjztChange(){ | ||
476 | this.bjztFlag = !this.bjztFlag; | ||
477 | }, | ||
444 | //改变实预测数据类型 | 478 | //改变实预测数据类型 |
445 | scyclxChange(val){ | 479 | scyclxChange(val){ |
446 | //清空已选中层户 | 480 | //清空已选中层户 |
447 | this.cbsmList = []; | 481 | this.cbsmList = []; |
448 | this.bsms = []; | 482 | this.bsms = []; |
483 | this.qsztList = []; | ||
449 | this.$refs.lpbContent.hbsmList = []; | 484 | this.$refs.lpbContent.hbsmList = []; |
450 | this.$nextTick(()=>{ | 485 | this.$nextTick(()=>{ |
451 | //户 | 486 | //户 |
... | @@ -495,6 +530,8 @@ export default { | ... | @@ -495,6 +530,8 @@ export default { |
495 | this.resetInfo(); | 530 | this.resetInfo(); |
496 | }); | 531 | }); |
497 | this.dialogVisible = true; | 532 | this.dialogVisible = true; |
533 | this.taskTitle = '添加'; | ||
534 | this.curBsm = ''; | ||
498 | }, | 535 | }, |
499 | //弹框中的保存按钮,根据不同菜单点击类型调用不同子组件的保存方法 | 536 | //弹框中的保存按钮,根据不同菜单点击类型调用不同子组件的保存方法 |
500 | saveInfo() { | 537 | saveInfo() { |
... | @@ -508,6 +545,9 @@ export default { | ... | @@ -508,6 +545,9 @@ export default { |
508 | case "ch": | 545 | case "ch": |
509 | this.$refs.ch.onSave(this.pd[0].bsm); | 546 | this.$refs.ch.onSave(this.pd[0].bsm); |
510 | break; | 547 | break; |
548 | case "c": | ||
549 | this.$refs.c.onSave(this.pd[0].bsm); | ||
550 | break; | ||
511 | default: | 551 | default: |
512 | break; | 552 | break; |
513 | } | 553 | } |
... | @@ -524,6 +564,9 @@ export default { | ... | @@ -524,6 +564,9 @@ export default { |
524 | case "ch": | 564 | case "ch": |
525 | this.$refs.ch.reset(); | 565 | this.$refs.ch.reset(); |
526 | break; | 566 | break; |
567 | case "c": | ||
568 | this.$refs.c.reset(); | ||
569 | break; | ||
527 | 570 | ||
528 | default: | 571 | default: |
529 | break; | 572 | break; |
... | @@ -547,18 +590,29 @@ export default { | ... | @@ -547,18 +590,29 @@ export default { |
547 | this.bsms = data; | 590 | this.bsms = data; |
548 | } | 591 | } |
549 | }, | 592 | }, |
593 | //获取选中户信息 | ||
594 | getQsztList(data, type) { | ||
595 | if (type) { | ||
596 | // 双击 | ||
597 | |||
598 | } else { | ||
599 | //单击 TO DO | ||
600 | this.qsztList = data; | ||
601 | } | ||
602 | }, | ||
550 | //获取选中层bsmlist | 603 | //获取选中层bsmlist |
551 | getCbsm(data){ | 604 | getCbsm(data){ |
552 | this.cbsmList = data; | 605 | this.cbsmList = data; |
553 | }, | 606 | }, |
554 | //不动产单元号输入框事件 | 607 | //不动产单元号输入框事件 |
555 | inputFocus() { | 608 | // inputFocus() { |
556 | this.inputWidth = 200; | 609 | // this.inputWidth = 200; |
557 | }, | 610 | // }, |
558 | inputBlur() { | 611 | // inputBlur() { |
559 | this.inputWidth = 74; | 612 | // this.inputWidth = 74; |
560 | }, | 613 | // }, |
561 | inputChange() { | 614 | inputChange() { |
615 | console.log(this.bdcdyh,'this.bdcdyh'); | ||
562 | if (this.bdcdyh != "") { | 616 | if (this.bdcdyh != "") { |
563 | // console.log("查询" + this.bdcdyh); | 617 | // console.log("查询" + this.bdcdyh); |
564 | this.$refs.lpbContent.lpbDataMap(this.bdcdyh); | 618 | this.$refs.lpbContent.lpbDataMap(this.bdcdyh); |
... | @@ -569,11 +623,13 @@ export default { | ... | @@ -569,11 +623,13 @@ export default { |
569 | }); | 623 | }); |
570 | } | 624 | } |
571 | }, | 625 | }, |
572 | //调用楼盘表信息查询接口 | 626 | //调用楼盘表信息查询和图例统计接口 |
573 | getlpbData() { | 627 | getlpbData() { |
574 | this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx); | 628 | this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx); |
629 | this.getDyztBsmList(); | ||
630 | this.getLpbFwytAndQlxz(); | ||
575 | //改变楼盘表子组件的key值,重新渲染 | 631 | //改变楼盘表子组件的key值,重新渲染 |
576 | // this.time = new Date().getTime(); | 632 | this.time = new Date().getTime(); |
577 | }, | 633 | }, |
578 | //实预测装换 | 634 | //实预测装换 |
579 | plScYcChange() { | 635 | plScYcChange() { |
... | @@ -612,18 +668,23 @@ export default { | ... | @@ -612,18 +668,23 @@ export default { |
612 | }, | 668 | }, |
613 | //批量添加不动产单元号 | 669 | //批量添加不动产单元号 |
614 | addBdcdyh() { | 670 | addBdcdyh() { |
615 | // this.pd[0].bsm //自然幢标识码 | 671 | if (this.qsztList.indexOf('1') > -1) { |
616 | batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then( | 672 | Message.warning("已提交的户无法继续操作") |
617 | (res) => { | 673 | }else{ |
618 | if (res.code === 200) { | 674 | batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then( |
619 | this.$message.success("生成完成!"); | 675 | (res) => { |
620 | } else if(res.code === 206){ | 676 | if (res.code === 200) { |
621 | let hasGenerateCount = res.result.hasGenerateCount; | 677 | this.$message.success("生成完成!"); |
622 | let unGenerateCount = res.result.unGenerateCount; | 678 | } else if(res.code === 206){ |
623 | this.open(hasGenerateCount,unGenerateCount); | 679 | let hasGenerateCount = res.result.hasGenerateCount; |
680 | let unGenerateCount = res.result.unGenerateCount; | ||
681 | this.open(hasGenerateCount,unGenerateCount); | ||
682 | }else { | ||
683 | this.$message.warning(res.message) | ||
684 | } | ||
624 | } | 685 | } |
625 | } | 686 | ); |
626 | ); | 687 | } |
627 | }, | 688 | }, |
628 | 689 | ||
629 | open(hasGenerateCount,unGenerateCount) { | 690 | open(hasGenerateCount,unGenerateCount) { |
... | @@ -774,7 +835,9 @@ export default { | ... | @@ -774,7 +835,9 @@ export default { |
774 | padding: 20px 0; | 835 | padding: 20px 0; |
775 | background-color: #ffffff; | 836 | background-color: #ffffff; |
776 | margin-bottom: 15px; | 837 | margin-bottom: 15px; |
838 | position: relative; | ||
777 | .searchContent { | 839 | .searchContent { |
840 | margin-left: 62px; | ||
778 | box-sizing: border-box; | 841 | box-sizing: border-box; |
779 | padding: 0 20px; | 842 | padding: 0 20px; |
780 | /deep/.el-radio-button__inner { | 843 | /deep/.el-radio-button__inner { |
... | @@ -797,6 +860,22 @@ export default { | ... | @@ -797,6 +860,22 @@ export default { |
797 | display: inline-block; | 860 | display: inline-block; |
798 | } | 861 | } |
799 | } | 862 | } |
863 | .change{ | ||
864 | position: absolute; | ||
865 | left: 0; | ||
866 | top: 0; | ||
867 | height: 100%; | ||
868 | width: 80px; | ||
869 | border-right: 1px solid #dedede; | ||
870 | i{ | ||
871 | cursor: pointer; | ||
872 | color: #0090FF; | ||
873 | font-size: 36px; | ||
874 | display: inherit; | ||
875 | text-align: center; | ||
876 | line-height: 128px; | ||
877 | } | ||
878 | } | ||
800 | .radioBtn { | 879 | .radioBtn { |
801 | margin-left: 10px; | 880 | margin-left: 10px; |
802 | padding: 12px 10px; | 881 | padding: 12px 10px; |
... | @@ -918,7 +997,7 @@ export default { | ... | @@ -918,7 +997,7 @@ export default { |
918 | } | 997 | } |
919 | .btnGroup { | 998 | .btnGroup { |
920 | margin: 20px auto 0; | 999 | margin: 20px auto 0; |
921 | width: 230px; | 1000 | width: 260px; |
922 | } | 1001 | } |
923 | .hbjDialog{ | 1002 | .hbjDialog{ |
924 | /deep/ .el-dialog{ | 1003 | /deep/ .el-dialog{ | ... | ... |
... | @@ -21,7 +21,7 @@ | ... | @@ -21,7 +21,7 @@ |
21 | </td> | 21 | </td> |
22 | <td colspan="2" align="center">自然幢号</td> | 22 | <td colspan="2" align="center">自然幢号</td> |
23 | <td colspan="4"> | 23 | <td colspan="4"> |
24 | <el-input v-model="form.zrzh" maxlength="24"></el-input> | 24 | <el-input v-model="form.zrzh" maxlength="24" disabled></el-input> |
25 | </td> | 25 | </td> |
26 | </tr> | 26 | </tr> |
27 | <tr height="30"> | 27 | <tr height="30"> |
... | @@ -55,33 +55,33 @@ | ... | @@ -55,33 +55,33 @@ |
55 | <tr height="30"> | 55 | <tr height="30"> |
56 | <td colspan="2" align="center">预测建筑面积(㎡)</td> | 56 | <td colspan="2" align="center">预测建筑面积(㎡)</td> |
57 | <td colspan="4"> | 57 | <td colspan="4"> |
58 | <el-input v-model="form.ycjzmj"></el-input> | 58 | <el-input v-model="form.ycjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
59 | </td> | 59 | </td> |
60 | <td colspan="2" align="center">实测建筑面积(㎡)</td> | 60 | <td colspan="2" align="center">实测建筑面积(㎡)</td> |
61 | <td colspan="4"> | 61 | <td colspan="4"> |
62 | <el-input v-model="form.scjzmj"></el-input> | 62 | <el-input v-model="form.scjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
63 | </td> | 63 | </td> |
64 | </tr> | 64 | </tr> |
65 | 65 | ||
66 | <tr height="30"> | 66 | <tr height="30"> |
67 | <td colspan="2" align="center">预测地下面积(㎡)</td> | 67 | <td colspan="2" align="center">预测地下面积(㎡)</td> |
68 | <td colspan="4"> | 68 | <td colspan="4"> |
69 | <el-input v-model="form.ycdxmj"></el-input> | 69 | <el-input v-model="form.ycdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
70 | </td> | 70 | </td> |
71 | <td colspan="2" align="center">实测地下面积(㎡)</td> | 71 | <td colspan="2" align="center">实测地下面积(㎡)</td> |
72 | <td colspan="4"> | 72 | <td colspan="4"> |
73 | <el-input v-model="form.scdxmj"></el-input> | 73 | <el-input v-model="form.scdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
74 | </td> | 74 | </td> |
75 | </tr> | 75 | </tr> |
76 | 76 | ||
77 | <tr height="30"> | 77 | <tr height="30"> |
78 | <td colspan="2" align="center">预测其他面积(㎡)</td> | 78 | <td colspan="2" align="center">预测其他面积(㎡)</td> |
79 | <td colspan="4"> | 79 | <td colspan="4"> |
80 | <el-input v-model="form.ycqtmj"></el-input> | 80 | <el-input v-model="form.ycqtmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
81 | </td> | 81 | </td> |
82 | <td colspan="2" align="center">实测其他面积(㎡)</td> | 82 | <td colspan="2" align="center">实测其他面积(㎡)</td> |
83 | <td colspan="4"> | 83 | <td colspan="4"> |
84 | <el-input v-model="form.scqymj"></el-input> | 84 | <el-input v-model="form.scqymj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input> |
85 | </td> | 85 | </td> |
86 | </tr> | 86 | </tr> |
87 | 87 | ||
... | @@ -96,28 +96,25 @@ | ... | @@ -96,28 +96,25 @@ |
96 | :rowspan="ytTitleRowspan" | 96 | :rowspan="ytTitleRowspan" |
97 | align="center" | 97 | align="center" |
98 | > | 98 | > |
99 | <el-button | 99 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> |
100 | type="primary" | ||
101 | size="mini" | ||
102 | style="margin-right: 10px" | ||
103 | @click="addYtInfo" | ||
104 | >添加</el-button | ||
105 | > | ||
106 | <span>用途</span> | 100 | <span>用途</span> |
107 | </td> | 101 | </td> |
108 | <td colspan="1" align="center"> | 102 | <td colspan="1" align="center"> |
109 | <span @click="deleteYtInfo(index)">删除</span> | 103 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> |
110 | </td> | 104 | </td> |
111 | <td colspan="9"> | 105 | <td colspan="9"> |
112 | <el-select v-model="item1.fwytzdbsm" placeholder="请选择"> | 106 | <el-select-tree style="width:100%" |
113 | <el-option | 107 | ref="yt" |
114 | v-for="item in $store.state.tdytList" | 108 | v-if="show" |
115 | :key="item.bsm" | 109 | :default-expand-all="defaultExpandAll" |
116 | :label="item.mc" | 110 | :multiple="multiple" |
117 | :value="item.bsm" | 111 | :placeholder="placeholder" |
118 | > | 112 | :data="$store.state.fwytList" |
119 | </el-option> | 113 | :props="treeProps" |
120 | </el-select> | 114 | :check-strictly="checkStrictly" |
115 | :clearable="clearable" | ||
116 | v-model="item1.fwytzdbsm" | ||
117 | ></el-select-tree> | ||
121 | </td> | 118 | </td> |
122 | </tr> | 119 | </tr> |
123 | 120 | ||
... | @@ -132,28 +129,25 @@ | ... | @@ -132,28 +129,25 @@ |
132 | :rowspan="fwjgTitleRowspan" | 129 | :rowspan="fwjgTitleRowspan" |
133 | align="center" | 130 | align="center" |
134 | > | 131 | > |
135 | <el-button | 132 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> |
136 | type="primary" | ||
137 | size="mini" | ||
138 | style="margin-right: 10px" | ||
139 | @click="addFwjgInfo" | ||
140 | >添加</el-button | ||
141 | > | ||
142 | <span>房屋结构</span> | 133 | <span>房屋结构</span> |
143 | </td> | 134 | </td> |
144 | <td colspan="1" align="center"> | 135 | <td colspan="1" align="center"> |
145 | <span @click="deleteFwjgInfo(index)">删除</span> | 136 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> |
146 | </td> | 137 | </td> |
147 | <td colspan="9"> | 138 | <td colspan="9"> |
148 | <el-select v-model="item1.fwjgzdbsm" placeholder="请选择"> | 139 | <el-select-tree style="width:100%" |
149 | <el-option | 140 | ref="yt" |
150 | v-for="item in $store.state.jgOptions" | 141 | v-if="show" |
151 | :key="item.bsm" | 142 | :default-expand-all="defaultExpandAll" |
152 | :label="item.mc" | 143 | :multiple="multiple" |
153 | :value="item.bsm" | 144 | :placeholder="placeholder" |
154 | > | 145 | :data="$store.state.jgOptions" |
155 | </el-option> | 146 | :props="treeProps" |
156 | </el-select> | 147 | :check-strictly="checkStrictly" |
148 | :clearable="clearable" | ||
149 | v-model="item1.fwjgzdbsm" | ||
150 | ></el-select-tree> | ||
157 | </td> | 151 | </td> |
158 | </tr> | 152 | </tr> |
159 | 153 | ||
... | @@ -192,12 +186,34 @@ | ... | @@ -192,12 +186,34 @@ |
192 | 186 | ||
193 | <script> | 187 | <script> |
194 | import { insertLjzInfo } from "@api/lpb"; | 188 | import { insertLjzInfo } from "@api/lpb"; |
189 | import { getQjLjzDetailById,updateQjLjz } from "@api/ljz"; | ||
195 | import { formdate } from "@libs/function"; | 190 | import { formdate } from "@libs/function"; |
196 | export default { | 191 | export default { |
197 | name: "ljz", | 192 | name: "ljz", |
198 | components: {}, | 193 | components: {}, |
194 | props: { | ||
195 | ljzbsm:{ | ||
196 | type: String, | ||
197 | default: '', | ||
198 | } | ||
199 | }, | ||
199 | data() { | 200 | data() { |
200 | return { | 201 | return { |
202 | |||
203 | //树型结构 | ||
204 | show:true, | ||
205 | clearable: true, | ||
206 | defaultExpandAll: true, | ||
207 | multiple: false, | ||
208 | placeholder: '请选择', | ||
209 | disabled: false, | ||
210 | checkStrictly: true, | ||
211 | treeProps: { | ||
212 | value: 'bsm', | ||
213 | children: 'children', | ||
214 | label: 'mc' | ||
215 | }, | ||
216 | |||
201 | form: { | 217 | form: { |
202 | zrzbsm: "", | 218 | zrzbsm: "", |
203 | ljzh: "", //逻辑幢号 | 219 | ljzh: "", //逻辑幢号 |
... | @@ -269,7 +285,7 @@ export default { | ... | @@ -269,7 +285,7 @@ export default { |
269 | this.form = { | 285 | this.form = { |
270 | // zrzbsm: "", | 286 | // zrzbsm: "", |
271 | ljzh: "", //逻辑幢号 | 287 | ljzh: "", //逻辑幢号 |
272 | // zrzh: "", //自然幢号 | 288 | zrzh: this.$store.state.zrzh, //自然幢号 |
273 | ljzmc: "", //逻辑幢顺序号 | 289 | ljzmc: "", //逻辑幢顺序号 |
274 | bdcdyh: "", //不动产单元号 | 290 | bdcdyh: "", //不动产单元号 |
275 | mph: "", //门牌号 | 291 | mph: "", //门牌号 |
... | @@ -299,6 +315,8 @@ export default { | ... | @@ -299,6 +315,8 @@ export default { |
299 | zcs: "", //总层数 | 315 | zcs: "", //总层数 |
300 | jzwzt: "", //建筑物状态 | 316 | jzwzt: "", //建筑物状态 |
301 | }; | 317 | }; |
318 | this.ytTitleRowspan= 1; //用途的单元格垂直合并数量 | ||
319 | this.fwjgTitleRowspan= 1; //用途的单元格垂直合并数量 | ||
302 | }, | 320 | }, |
303 | deleteFwjgInfo(index) { | 321 | deleteFwjgInfo(index) { |
304 | if (this.form.fwjgList.length <= 1) { | 322 | if (this.form.fwjgList.length <= 1) { |
... | @@ -314,24 +332,95 @@ export default { | ... | @@ -314,24 +332,95 @@ export default { |
314 | onSave(data, bsm) { | 332 | onSave(data, bsm) { |
315 | //自然幢标识码 | 333 | //自然幢标识码 |
316 | this.form.zrzbsm = bsm; | 334 | this.form.zrzbsm = bsm; |
317 | insertLjzInfo(this.form).then((res) => { | 335 | if(this.ljzbsm == ''){ |
318 | if (res.code === 200) { | 336 | insertLjzInfo(this.form).then((res) => { |
319 | this.$message.success("保存成功"); | 337 | if (res.code === 200) { |
320 | //更新树结构数据 | 338 | this.$message.success("保存成功"); |
321 | console.log(this); | 339 | //更新树结构数据 |
322 | this.$parent.$parent.getLpbMenuTree(bsm); | 340 | console.log(this); |
323 | //关闭弹框 | 341 | this.$parent.$parent.getLpbMenuTree(bsm); |
324 | this.$parent.$parent.closeDaialog(); | 342 | //关闭弹框 |
325 | } | 343 | this.$parent.$parent.closeDaialog(); |
326 | }); | 344 | }else{ |
345 | this.$message.error(res.message); | ||
346 | } | ||
347 | }); | ||
348 | }else{ | ||
349 | //逻辑幢更新接口调用 TODO | ||
350 | console.log('保存'); | ||
351 | updateQjLjz(this.form).then((res)=>{ | ||
352 | if(res.code === 200){ | ||
353 | this.$message.success("修改成功") | ||
354 | } | ||
355 | }) | ||
356 | } | ||
327 | }, | 357 | }, |
328 | onSubmit() { | 358 | onSubmit() { |
329 | console.log(this.form); | 359 | // console.log(this.form); |
330 | }, | 360 | }, |
361 | //根据逻辑幢bsm查询逻辑幢信息 | ||
362 | getLjzInfo(bsm){ | ||
363 | //逻辑幢信息查询接口调用 bsm为逻辑幢bsm | ||
364 | getQjLjzDetailById(bsm).then((res)=>{ | ||
365 | if(res.code === 200){ | ||
366 | this.form = res.result; | ||
367 | this.form.zrzh = this.$store.state.zrzh; | ||
368 | this.form.fwjgList= [ | ||
369 | { | ||
370 | fwjgzdbsm: "", //房屋结构字典标识码 | ||
371 | glbsm: "", //关联标识码 | ||
372 | sx: "", //顺序 | ||
373 | }, | ||
374 | ]; | ||
375 | this.form.ytList= [ | ||
376 | { | ||
377 | glbsm: "", //关联标识码 | ||
378 | fwytzdbsm: "", //房屋用途字典标识码 | ||
379 | sx: "", //顺序 | ||
380 | }, | ||
381 | ]; | ||
382 | if(this.form.qjfwjg.length>0){ | ||
383 | this.form.fwjgList= []; | ||
384 | for(let i =0;i<this.form.qjfwjg.length;i++){ | ||
385 | this.form.fwjgList.push({ | ||
386 | fwjgzdbsm: this.form.qjfwjg[i].fwjgzdbsm, //房屋结构字典标识码 | ||
387 | glbsm: this.form.qjfwjg[i].glbsm, //关联标识码 | ||
388 | sx: this.form.qjfwjg[i].sx, //顺序 | ||
389 | }) | ||
390 | } | ||
391 | } | ||
392 | if(this.form.qjfwyt.length>0){ | ||
393 | this.form.ytList= []; | ||
394 | for(let i =0;i<this.form.qjfwyt.length;i++){ | ||
395 | this.form.ytList.push({ | ||
396 | fwytzdbsm: this.form.qjfwyt[i].fwytzdbsm, //房屋结构字典标识码 | ||
397 | glbsm: this.form.qjfwyt[i].glbsm, //关联标识码 | ||
398 | sx: this.form.qjfwyt[i].sx, //顺序 | ||
399 | }) | ||
400 | } | ||
401 | } | ||
402 | console.log(JSON.stringify(this.form)+":this.form") | ||
403 | } | ||
404 | }) | ||
405 | this.$forceUpdate(); | ||
406 | } | ||
407 | }, | ||
408 | created() { | ||
331 | }, | 409 | }, |
332 | created() {this.form.zrzh = this.$store.state.zrzh;}, | ||
333 | mounted() { | 410 | mounted() { |
411 | this.form.zrzh = this.$store.state.zrzh; | ||
334 | }, | 412 | }, |
413 | watch:{ | ||
414 | ljzbsm: { | ||
415 | handler: function (item) { | ||
416 | console.log(item,'item'); | ||
417 | if(item!='' && this.$parent.menuType == 'ljz'){ | ||
418 | this.getLjzInfo(this.ljzbsm) | ||
419 | } | ||
420 | }, | ||
421 | immediate: true | ||
422 | }, | ||
423 | } | ||
335 | }; | 424 | }; |
336 | </script> | 425 | </script> |
337 | <style rel="stylesheet/less" lang="less" scoped> | 426 | <style rel="stylesheet/less" lang="less" scoped> | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -46,9 +46,16 @@ | ... | @@ -46,9 +46,16 @@ |
46 | <script> | 46 | <script> |
47 | 47 | ||
48 | import {insertZdyInfo} from "@api/lpb" | 48 | import {insertZdyInfo} from "@api/lpb" |
49 | import {getQjZdyDetailById,updateQjZdy} from "@api/zdy" | ||
49 | export default { | 50 | export default { |
50 | name: "index", | 51 | name: "index", |
51 | components: {}, | 52 | components: {}, |
53 | props: { | ||
54 | zdybsm:{ | ||
55 | type: String, | ||
56 | default: '', | ||
57 | } | ||
58 | }, | ||
52 | data(){ | 59 | data(){ |
53 | return{ | 60 | return{ |
54 | form:{ | 61 | form:{ |
... | @@ -86,23 +93,42 @@ | ... | @@ -86,23 +93,42 @@ |
86 | submitForm(formName,zrzbsm,ljzbsm) { | 93 | submitForm(formName,zrzbsm,ljzbsm) { |
87 | this.form.zrzbsm=zrzbsm; | 94 | this.form.zrzbsm=zrzbsm; |
88 | this.form.ljzbsm= zrzbsm == ljzbsm ? '':ljzbsm; | 95 | this.form.ljzbsm= zrzbsm == ljzbsm ? '':ljzbsm; |
89 | this.$refs[formName].validate((valid) => { | 96 | //判断zdybsm是否为空,不为空的时候是编辑,为空的时候是新增 |
90 | if (valid) { | 97 | if (this.zdybsm == '') { |
91 | insertZdyInfo(this.form).then((res)=>{ | 98 | this.$refs[formName].validate((valid) => { |
92 | if(res.code===200){ | 99 | if (valid) { |
93 | this.$message.success("保存成功!") | 100 | insertZdyInfo(this.form).then((res)=>{ |
94 | //更新树结构数据 | 101 | if(res.code===200){ |
95 | this.$parent.$parent.getLpbMenuTree(zrzbsm); | 102 | this.$message.success("保存成功!") |
96 | //关闭弹框 | 103 | //更新树结构数据 |
97 | this.$parent.$parent.closeDaialog() | 104 | this.$parent.$parent.getLpbMenuTree(zrzbsm); |
98 | } | 105 | //关闭弹框 |
99 | return true; | 106 | this.$parent.$parent.closeDaialog() |
100 | }) | 107 | } |
101 | } else { | 108 | return true; |
102 | console.log('error submit!!'); | 109 | }) |
103 | return false; | 110 | } else { |
111 | console.log('error submit!!'); | ||
112 | return false; | ||
113 | } | ||
114 | }); | ||
115 | }else{ | ||
116 | //编辑幢单元接口 | ||
117 | updateQjZdy(this.form).then((res)=>{ | ||
118 | if(res.code === 200){ | ||
119 | this.$message.success("保存成功") | ||
120 | } | ||
121 | }) | ||
122 | } | ||
123 | }, | ||
124 | getZdyInfo(bsm){ | ||
125 | //查询幢单元信息接口 | ||
126 | getQjZdyDetailById(bsm).then((res)=>{ | ||
127 | if(res.code === 200){ | ||
128 | this.form = res.result; | ||
104 | } | 129 | } |
105 | }); | 130 | }) |
131 | |||
106 | }, | 132 | }, |
107 | reset(){ | 133 | reset(){ |
108 | this.form = { | 134 | this.form = { |
... | @@ -114,11 +140,21 @@ | ... | @@ -114,11 +140,21 @@ |
114 | bz:'', | 140 | bz:'', |
115 | } | 141 | } |
116 | } | 142 | } |
143 | }, | ||
144 | watch:{ | ||
145 | zdybsm: { | ||
146 | handler: function (item) { | ||
147 | if(item!='' && this.$parent.$parent.menuType == 'zdy'){ | ||
148 | this.getZdyInfo(item) | ||
149 | } | ||
150 | }, | ||
151 | immediate: true | ||
152 | }, | ||
117 | } | 153 | } |
118 | } | 154 | } |
119 | </script> | 155 | </script> |
120 | 156 | ||
121 | <style scoped> | 157 | <style scoped lang="less"> |
122 | /deep/.el-input__inner{ | 158 | /deep/.el-input__inner{ |
123 | width: 100%; | 159 | width: 100%; |
124 | border:0; | 160 | border:0; | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="lpb"> | 2 | <div class="lpb"> |
3 | <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> | 3 | <bjlp></bjlp> |
4 | <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> | ||
4 | <el-tab-pane label="编辑楼盘" name="edit"> | 5 | <el-tab-pane label="编辑楼盘" name="edit"> |
5 | <bjlp></bjlp> | ||
6 | </el-tab-pane> | 6 | </el-tab-pane> |
7 | <el-tab-pane label="预览楼盘" name="preview"> | 7 | <el-tab-pane label="预览楼盘" name="preview"> |
8 | <yllp></yllp> | 8 | <yllp></yllp> |
... | @@ -10,17 +10,15 @@ | ... | @@ -10,17 +10,15 @@ |
10 | <el-tab-pane label="详细信息" name="detail"> | 10 | <el-tab-pane label="详细信息" name="detail"> |
11 | <xxxx></xxxx> | 11 | <xxxx></xxxx> |
12 | </el-tab-pane> | 12 | </el-tab-pane> |
13 | </el-tabs> | 13 | </el-tabs> --> |
14 | </div> | 14 | </div> |
15 | </template> | 15 | </template> |
16 | 16 | ||
17 | <script> | 17 | <script> |
18 | import bjlp from "./bjlp" | 18 | import bjlp from "./bjlp" |
19 | import yllp from "./yllp" | ||
20 | import xxxx from "./xxxx" | ||
21 | export default { | 19 | export default { |
22 | name:"", | 20 | name:"", |
23 | components:{bjlp,yllp,xxxx}, | 21 | components:{bjlp}, |
24 | props:{}, | 22 | props:{}, |
25 | data() { | 23 | data() { |
26 | return { | 24 | return { | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class=""> | 2 | <div class=""> |
3 | <el-radio-group v-model="scyclx" @change="scyclxChange"> | ||
4 | <el-radio-button label="0">预测</el-radio-button> | ||
5 | <el-radio-button label="1">实测</el-radio-button> | ||
6 | </el-radio-group> | ||
7 | <el-button @click="update">更新数据</el-button> | ||
8 | <el-table | 3 | <el-table |
9 | :data="tableData" | 4 | :data="tableData" |
10 | style="width: 100%;margin-bottom: 20px;" | 5 | style="width: 100%;margin-bottom: 20px;" |
... | @@ -14,6 +9,7 @@ | ... | @@ -14,6 +9,7 @@ |
14 | :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> | 9 | :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> |
15 | <el-table-column | 10 | <el-table-column |
16 | prop="mc" | 11 | prop="mc" |
12 | width="200" | ||
17 | label="地址(单元名称)"> | 13 | label="地址(单元名称)"> |
18 | </el-table-column> | 14 | </el-table-column> |
19 | <el-table-column | 15 | <el-table-column |
... | @@ -73,7 +69,6 @@ export default { | ... | @@ -73,7 +69,6 @@ export default { |
73 | tableData: [], | 69 | tableData: [], |
74 | scData:[], | 70 | scData:[], |
75 | ycData:[], | 71 | ycData:[], |
76 | scyclx:'0', | ||
77 | } | 72 | } |
78 | }, | 73 | }, |
79 | created(){}, | 74 | created(){}, |
... | @@ -82,13 +77,6 @@ export default { | ... | @@ -82,13 +77,6 @@ export default { |
82 | }, | 77 | }, |
83 | methods:{ | 78 | methods:{ |
84 | 79 | ||
85 | scyclxChange(){ | ||
86 | if(this.scyclx === '0'){ | ||
87 | this.tableData = this.ycData; | ||
88 | }else { | ||
89 | this.tableData = this.scData; | ||
90 | } | ||
91 | }, | ||
92 | 80 | ||
93 | chFilter(row, column){ | 81 | chFilter(row, column){ |
94 | if(row.ch === 0){ | 82 | if(row.ch === 0){ |
... | @@ -106,26 +94,20 @@ export default { | ... | @@ -106,26 +94,20 @@ export default { |
106 | } | 94 | } |
107 | }, | 95 | }, |
108 | 96 | ||
109 | update(){ | 97 | // update(){ |
110 | this.getData(); | 98 | // this.getData(); |
111 | }, | 99 | // }, |
112 | 100 | ||
113 | getData(){ | 101 | getData(){ |
114 | let zrzbsm = this.$store.state.zrzbsm; | 102 | let zrzbsm = this.$store.state.zrzbsm; |
115 | // let scyclx = this.scyclx; | 103 | // let scyclx = this.scyclx; |
116 | getDetailInfo(zrzbsm,'0').then((res)=>{ | 104 | getDetailInfo(zrzbsm,this.$parent.scyclx).then((res)=>{ |
117 | if(res.code===200){ | 105 | if(res.code===200){ |
118 | console.log(res.result) | 106 | console.log(res.result) |
119 | this.ycData = res.result; | 107 | this.ycData = res.result; |
120 | this.tableData=this.ycData; | 108 | this.tableData=this.ycData; |
121 | } | 109 | } |
122 | }); | 110 | }); |
123 | getDetailInfo(zrzbsm,'1').then((res)=>{ | ||
124 | if(res.code===200){ | ||
125 | console.log(res.result) | ||
126 | this.scData = res.result; | ||
127 | } | ||
128 | }) | ||
129 | }, | 111 | }, |
130 | 112 | ||
131 | load(tree, treeNode, resolve) { | 113 | load(tree, treeNode, resolve) { |
... | @@ -148,8 +130,16 @@ export default { | ... | @@ -148,8 +130,16 @@ export default { |
148 | 130 | ||
149 | 131 | ||
150 | }, | 132 | }, |
151 | computed: {}, | 133 | computed: { |
152 | watch: {}, | 134 | scyclx(){ |
135 | return this.$parent.scyclx | ||
136 | } | ||
137 | }, | ||
138 | watch: { | ||
139 | scyclx(){ | ||
140 | this.getData(); | ||
141 | } | ||
142 | }, | ||
153 | } | 143 | } |
154 | </script> | 144 | </script> |
155 | <style scoped lang="less"> | 145 | <style scoped lang="less"> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main" ref="mainBox"> | 2 | <div class="main" ref="mainBox"> |
3 | <table border="1"> | 3 | <table border="1"> |
4 | <tr> | 4 | <tr> |
5 | <td colspan="3">宗地代码</td> | 5 | <td colspan="3">宗地代码</td> |
6 | <td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td> | 6 | <td colspan="4"> |
7 | <el-input v-model="zddm " disabled></el-input> | ||
8 | </td> | ||
7 | </tr> | 9 | </tr> |
8 | <tr> | 10 | <tr> |
9 | <td colspan="3">建筑物区分所有权业主共有部分权利人</td> | 11 | <td colspan="3">建筑物区分所有权业主共有部分权利人</td> |
10 | <td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td> | 12 | <td colspan="4"> |
13 | <el-input v-model="Data.qlr" disabled></el-input> | ||
14 | </td> | ||
11 | </tr> | 15 | </tr> |
12 | </table> | 16 | </table> |
13 | <table border="1"> | 17 | <table border="1"> |
14 | <tr> | 18 | <tr> |
15 | <td> | 19 | <th> |
16 | <el-button | 20 | <el-button |
17 | type="primary" | 21 | type="primary" |
18 | class="changeBtn inAdd addMinus" | 22 | class="changeBtn inAdd addMinus" |
19 | @click="addRow" | 23 | @click="addRow" |
20 | >+</el-button | 24 | >+ |
21 | > | 25 | </el-button |
22 | </td> | 26 | > |
23 | <td>建(构)筑物编号</td> | 27 | </th> |
24 | <td>建(构)筑物数量</td> | 28 | <th>建(构)筑物编号</th> |
25 | <td>建(构)筑物面积(㎡)</td> | 29 | <th>建(构)筑物数量</th> |
26 | <td>占地面积(㎡)</td> | 30 | <th>建(构)筑物面积(㎡)</th> |
27 | <td>分摊土地面积(㎡)</td> | 31 | <th>占地面积(㎡)</th> |
28 | <td>附记</td> | 32 | <th>分摊土地面积(㎡)</th> |
33 | <th>附记</th> | ||
29 | </tr> | 34 | </tr> |
30 | <tr v-for="(item,i) in Data.list" :key="i"> | 35 | <tr v-for="(item,i) in Data.list" :key="i"> |
31 | <td> | 36 | <td> |
32 | <el-button | 37 | <el-button |
33 | type="primary" | 38 | type="primary" |
34 | class="changeBtn inMinus addMinus" | 39 | class="changeBtn inMinus addMinus" |
35 | @click="delRow(i)" | 40 | @click="delRow(i)" |
36 | >-</el-button | 41 | >- |
42 | </el-button | ||
37 | > | 43 | > |
38 | </td> | 44 | </td> |
39 | <td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td> | 45 | <td> |
40 | <td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td> | 46 | <el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号" maxlength="10"></el-input> |
41 | <td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td> | 47 | </td> |
42 | <td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td> | 48 | <td> |
43 | <td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td> | 49 | <el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d{0,9}/g)) || null" |
44 | <td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td> | 50 | placeholder="请输入建(构)筑物数量"></el-input> |
51 | </td> | ||
52 | <td> | ||
53 | <el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" | ||
54 | placeholder="请输入建(构)筑物面积(㎡)"></el-input> | ||
55 | </td> | ||
56 | <td> | ||
57 | <el-input v-model="item.zdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" | ||
58 | placeholder="请输入占地面积(㎡)"></el-input> | ||
59 | </td> | ||
60 | <td> | ||
61 | <el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" | ||
62 | placeholder="请输入分摊土地面积(㎡)"></el-input> | ||
63 | </td> | ||
64 | <td> | ||
65 | <el-input v-model="item.fj" placeholder="请输入附记"></el-input> | ||
66 | </td> | ||
45 | </tr> | 67 | </tr> |
46 | <!-- <tr> | ||
47 | <td>统计</td> | ||
48 | <td>{{sumTdsyqsyqmj}}</td> | ||
49 | <td>{{sumDydytdmj}}</td> | ||
50 | <td>{{sumFttdmj}}</td> | ||
51 | <td>{{sumFttdmj}}</td> | ||
52 | <td>{{sumFttdmj}}</td> | ||
53 | <td>{{sumFttdmj}}</td> | ||
54 | </tr>--> | ||
55 | </table> | 68 | </table> |
56 | <!-- <div class="pers"> | ||
57 | <el-button @click="save" type="primary">保存</el-button> | ||
58 | </div> --> | ||
59 | <div class="header-button" :style="{width:mainBoxWidth+'px'}"> | 69 | <div class="header-button" :style="{width:mainBoxWidth+'px'}"> |
60 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> | 70 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> |
61 | </div> | 71 | </div> |
62 | </div> | 72 | </div> |
63 | </template> | 73 | </template> |
... | @@ -85,14 +95,13 @@ | ... | @@ -85,14 +95,13 @@ |
85 | fj: '' | 95 | fj: '' |
86 | }] | 96 | }] |
87 | }, | 97 | }, |
88 | mainBoxWidth:0 | 98 | mainBoxWidth: 0 |
89 | } | 99 | } |
90 | }, | 100 | }, |
91 | 101 | ||
92 | methods: { | 102 | methods: { |
93 | getData(id) { | 103 | getData(id) { |
94 | queryYzgy(id).then(res => { | 104 | queryYzgy(id).then(res => { |
95 | console.log(res) | ||
96 | if (res.result != null) { | 105 | if (res.result != null) { |
97 | this.Data = res.result | 106 | this.Data = res.result |
98 | } | 107 | } |
... | @@ -100,12 +109,11 @@ | ... | @@ -100,12 +109,11 @@ |
100 | }, | 109 | }, |
101 | save() { | 110 | save() { |
102 | console.log(this.Data); | 111 | console.log(this.Data); |
103 | if(this.Data.list.length === 0){ | 112 | if (this.Data.list.length === 0) { |
104 | Message.info("至少填写一条建筑物信息") | 113 | Message.info("至少填写一条建筑物信息") |
105 | return | 114 | return |
106 | } | 115 | } |
107 | saveYzgy(this.Data).then(res => { | 116 | saveYzgy(this.Data).then(res => { |
108 | console.log(res) | ||
109 | if (res.success) { | 117 | if (res.success) { |
110 | Message.success("新增成功") | 118 | Message.success("新增成功") |
111 | this.getData(this.$store.state.zrzbsm) | 119 | this.getData(this.$store.state.zrzbsm) |
... | @@ -194,7 +202,9 @@ | ... | @@ -194,7 +202,9 @@ |
194 | .dzwsl { | 202 | .dzwsl { |
195 | width: 200px; | 203 | width: 200px; |
196 | } | 204 | } |
205 | |||
197 | .header-button { | 206 | .header-button { |
207 | z-index: 3; | ||
198 | height: 50px; | 208 | height: 50px; |
199 | position: fixed; | 209 | position: fixed; |
200 | bottom: 0; | 210 | bottom: 0; | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -5,6 +5,7 @@ let Timestamp = new Date().getTime(); | ... | @@ -5,6 +5,7 @@ let Timestamp = new Date().getTime(); |
5 | function resolve(dir) { | 5 | function resolve(dir) { |
6 | return path.join(__dirname, dir) | 6 | return path.join(__dirname, dir) |
7 | } | 7 | } |
8 | const UglifyJsPlugin = require("uglifyjs-webpack-plugin"); | ||
8 | 9 | ||
9 | module.exports = { | 10 | module.exports = { |
10 | publicPath: './', | 11 | publicPath: './', |
... | @@ -19,6 +20,7 @@ module.exports = { | ... | @@ -19,6 +20,7 @@ module.exports = { |
19 | .set('@libs', resolve('src/libs')) | 20 | .set('@libs', resolve('src/libs')) |
20 | .set('@router', resolve('src/router')) | 21 | .set('@router', resolve('src/router')) |
21 | .set('@components', resolve('src/components')) | 22 | .set('@components', resolve('src/components')) |
23 | .set('@assets', resolve('src/assets')) | ||
22 | }, | 24 | }, |
23 | pluginOptions: { | 25 | pluginOptions: { |
24 | 'style-resources-loader': { | 26 | 'style-resources-loader': { |
... | @@ -31,8 +33,17 @@ module.exports = { | ... | @@ -31,8 +33,17 @@ module.exports = { |
31 | filename: `js/[name].${Timestamp}.js`, | 33 | filename: `js/[name].${Timestamp}.js`, |
32 | chunkFilename: `js/[name].${Timestamp}.js` | 34 | chunkFilename: `js/[name].${Timestamp}.js` |
33 | }, | 35 | }, |
34 | // plugins: [ | 36 | plugins: [ |
35 | 37 | // 去除console和debugger | |
38 | // new UglifyJsPlugin({ | ||
39 | // uglifyOptions: { | ||
40 | // compress: { | ||
41 | // drop_console: true, | ||
42 | // drop_debugger: true, | ||
43 | // }, | ||
44 | // }, | ||
45 | // parallel: true, | ||
46 | // }), | ||
36 | // new FileManagerPlugin({ //初始化 filemanager-webpack-plugin 插件实例 | 47 | // new FileManagerPlugin({ //初始化 filemanager-webpack-plugin 插件实例 |
37 | // onEnd: { | 48 | // onEnd: { |
38 | // mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹 | 49 | // mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹 |
... | @@ -41,16 +52,20 @@ module.exports = { | ... | @@ -41,16 +52,20 @@ module.exports = { |
41 | // ] | 52 | // ] |
42 | // } | 53 | // } |
43 | // }) | 54 | // }) |
44 | // ] | 55 | ] |
45 | }, | 56 | }, |
46 | devServer: { | 57 | devServer: { |
58 | host: "192.168.2.61", | ||
47 | host: "0.0.0.0", | 59 | host: "0.0.0.0", |
48 | port: 8006, | 60 | port: 8008, |
49 | https: false, | 61 | https: false, |
50 | hotOnly: false, | 62 | hotOnly: false, |
51 | proxy: { | 63 | proxy: { |
52 | "/api": { | 64 | "/api": { |
53 | target: process.env.VUE_APP_api3, | 65 | // target: 'https://192.168.2.119:8006', //泽平 |
66 | // target: process.env.VUE_APP_api1, //本地 | ||
67 | target: process.env.VUE_APP_api, //赵千 | ||
68 | // target: process.env.VUE_APP_api4, //赵千 | ||
54 | changeOrigin: true, | 69 | changeOrigin: true, |
55 | pathRewrite: { | 70 | pathRewrite: { |
56 | "^/api": "/", | 71 | "^/api": "/", | ... | ... |
-
Please register or sign in to post a comment