Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
14e81702 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 52d46dc6 edf5e408
Expand all
Inline Side-by-side
Showing 7 changed files with 63 additions and 20 deletions
1 <template> 1 <template>
2 <div class="main"> 2 <div class="mainbox1">
3 <template v-if="isFwsxbg"> 3 <template v-if="isFwsxbg">
4 <!-- <p class="tips">查询条件</p> --> 4 <!-- <p class="tips">查询条件</p> -->
5 <el-row class="box"> 5 <el-row class="box">
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
127 layout="prev, pager, next,total" 127 layout="prev, pager, next,total"
128 :total="total" 128 :total="total"
129 :current-page="pageNo" 129 :current-page="pageNo"
130 :page-size="pageSize"
130 @current-change="handleCurrentChange" 131 @current-change="handleCurrentChange"
131 > 132 >
132 </el-pagination> 133 </el-pagination>
...@@ -143,7 +144,6 @@ ...@@ -143,7 +144,6 @@
143 maxlength="28" 144 maxlength="28"
144 v-model="bdcdyh" 145 v-model="bdcdyh"
145 :style="{ width: inputWidth + 'px' }" 146 :style="{ width: inputWidth + 'px' }"
146 @change="inputChange"
147 class="searchInput" 147 class="searchInput"
148 placeholder="输入不动产单元号或室号" 148 placeholder="输入不动产单元号或室号"
149 ><i 149 ><i
...@@ -389,17 +389,21 @@ ...@@ -389,17 +389,21 @@
389 lpbContentHeight: 0, 389 lpbContentHeight: 0,
390 lpbContentwidth: 0, 390 lpbContentwidth: 0,
391 lpbloading:true, 391 lpbloading:true,
392 hbsm:''
392 }; 393 };
393 }, 394 },
394 created() {}, 395 created() {},
395 mounted() { 396 mounted() {
397 this.queryData.pageNo = this.pageNo;
398 this.queryData.pageSize = this.pageSize;
399 this.queryData.type = this.queryType;
396 this.getData(this.queryData); 400 this.getData(this.queryData);
397 // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight'); 401 // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
398 this.$nextTick(() => { 402 this.$nextTick(() => {
399 this.tableHeight = 403 this.tableHeight =
400 (document.documentElement.clientHeight || document.body.clientHeight) - 404 (document.documentElement.clientHeight || document.body.clientHeight) -
401 352; 405 342;
402 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222; 406 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 262;
403 }); 407 });
404 }, 408 },
405 methods: { 409 methods: {
...@@ -417,16 +421,20 @@ ...@@ -417,16 +421,20 @@
417 }, 421 },
418 // 查询 422 // 查询
419 query(){ 423 query(){
424 this.queryData.pageNo = this.pageNo;
425 this.queryData.pageSize = this.pageSize;
426 this.queryData.type = this.queryType;
420 this.getData(this.queryData) 427 this.getData(this.queryData)
421 }, 428 },
422 // 更多查询 429 // 更多查询
423 moreSearch(){ 430 moreSearch(){
431 console.log(this.tableHeight);
424 if(this.ismore === true){ 432 if(this.ismore === true){
425 this.ismore = false; 433 this.ismore = false;
426 this.$parent.tableHeight+=55; 434 this.tableHeight+=69;
427 }else { 435 }else {
428 this.ismore = true; 436 this.ismore = true;
429 this.$parent.tableHeight-=55; 437 this.tableHeight-=69;
430 } 438 }
431 }, 439 },
432 onSubmit() {}, 440 onSubmit() {},
...@@ -469,11 +477,16 @@ ...@@ -469,11 +477,16 @@
469 //点击办理 477 //点击办理
470 handleClick(row) { 478 handleClick(row) {
471 let params = { bsm: row.bsm, type: this.queryType }; 479 let params = { bsm: row.bsm, type: this.queryType };
472 if(this.queryType == 'h'){ 480 this.bdcdyh = row.bdcdyh;
481 if(row.dylx == 'h0' || row.dylx == 'h1'){
482 this.hbsm = row.bsm;
473 getQjHDetailByBsm(row.bsm).then((res)=>{ 483 getQjHDetailByBsm(row.bsm).then((res)=>{
474 if(res.code===200){ 484 if(res.code===200){
475 this.zrzbsm = res.result.zrzbsm; 485 this.zrzbsm = res.result.zrzbsm;
476 this.isFwsxbg = false; 486 this.isFwsxbg = false;
487 this.$nextTick(()=>{
488 this.scyclx = row.dylx == 'h0' ? '0':'1'
489 })
477 } 490 }
478 }) 491 })
479 }else{ 492 }else{
...@@ -704,6 +717,8 @@ ...@@ -704,6 +717,8 @@
704 this.getLpbFwytAndQlxz(); 717 this.getLpbFwytAndQlxz();
705 this.$nextTick(()=>{ 718 this.$nextTick(()=>{
706 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; 719 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
720 this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
721 this.$refs.lpbContent.hbsmList.push(this.hbsm)
707 }) 722 })
708 } 723 }
709 }, 724 },
...@@ -723,16 +738,17 @@ ...@@ -723,16 +738,17 @@
723 </script> 738 </script>
724 739
725 <style scoped lang="less"> 740 <style scoped lang="less">
726 .main{ 741 .mainbox1{
727 padding: 0; 742 width: 100%;
743 height: 100%;
744 box-sizing: border-box;
745 padding:20px;
746 background-color: #eaedf5;
728 .box{ 747 .box{
729 background-color: white; 748 background-color: white;
730 padding: 10px 0; 749 padding: 10px 0;
731 margin-bottom: 10px; 750 margin-bottom: 10px;
732 } 751 }
733 }
734 /*.main {
735 background-color: #eaedf5;
736 .tips{ 752 .tips{
737 color: #9B9B9B; 753 color: #9B9B9B;
738 margin-left: 2px; 754 margin-left: 2px;
...@@ -852,5 +868,9 @@ ...@@ -852,5 +868,9 @@
852 } 868 }
853 869
854 } 870 }
871 }
872 /*.main {
873 background-color: #eaedf5;
874
855 }*/ 875 }*/
856 </style> 876 </style>
......
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
314 methods: { 314 methods: {
315 315
316 inputBlur(e){ 316 inputBlur(e){
317 if(e.target.value!==''&&e.target.value>0&&e.target.value<10){ 317 if(e.target.value!==''&&+e.target.value>0&&+e.target.value<10){
318 e.target.style.border="" 318 e.target.style.border=""
319 }else{ 319 }else{
320 e.target.style.border="1px solid red"; 320 e.target.style.border="1px solid red";
...@@ -424,12 +424,13 @@ ...@@ -424,12 +424,13 @@
424 data:this.form.ftxs, 424 data:this.form.ftxs,
425 name:'分摊系数', 425 name:'分摊系数',
426 dom:this.$refs.ftxs, 426 dom:this.$refs.ftxs,
427 rule: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/, //非空 427 rule:/^(?!0(\.0{1,2})?$)(\d(\.\d{1,2})?)$/, //大于0小于10的所有保留两位的数字
428 }, 428 },
429 ]; 429 ];
430 let flag = true; 430 let flag = true;
431 this.rules.forEach(item=>{ 431 this.rules.forEach(item=>{
432 if(item.rule.test(item.data) || item.data == null){ 432 if(item.data !==""){
433 if(!item.rule.test(+item.data) || item.data == null){
433 if(item.dom.$el){ 434 if(item.dom.$el){
434 item.dom.$el.style.border = '1px solid red'; 435 item.dom.$el.style.border = '1px solid red';
435 item.dom.$el.style.boxSizing = 'border-box'; 436 item.dom.$el.style.boxSizing = 'border-box';
...@@ -440,10 +441,13 @@ ...@@ -440,10 +441,13 @@
440 flag = false; 441 flag = false;
441 return false 442 return false
442 } 443 }
444 }
443 }) 445 })
444 446
445 this.form['hbsms'] = this.bsms 447 this.form['hbsms'] = this.bsms
446 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 448 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
449 this.$nextTick(()=> {
450 if (flag) {
447 for(let i=0;i< this.form.fwjgList.length;i++){ 451 for(let i=0;i< this.form.fwjgList.length;i++){
448 if(this.form.fwjgList[i].fwjgzdbsm===''){ 452 if(this.form.fwjgList[i].fwjgzdbsm===''){
449 this.form.fwjgList.splice(i,1); 453 this.form.fwjgList.splice(i,1);
...@@ -471,6 +475,14 @@ ...@@ -471,6 +475,14 @@
471 this.close(); 475 this.close();
472 } 476 }
473 }) 477 })
478 }else{
479 this.$message({
480 // message: item.name+'不能为空',
481 message: '表单数据有误',
482 type: "warning",
483 });
484 }
485 })
474 }, 486 },
475 cancel: function () { 487 cancel: function () {
476 this.close() 488 this.close()
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="mainbox">
3 <el-tabs v-model="tabName" @tab-click="handleClick" class="menu"> 3 <el-tabs v-model="tabName" @tab-click="handleClick" class="menu">
4 <el-tab-pane label="宗地" name="zd"> 4 <el-tab-pane label="宗地" name="zd">
5 <fwsxbg-tab queryType="zd"></fwsxbg-tab> 5 <fwsxbg-tab queryType="zd"></fwsxbg-tab>
...@@ -61,14 +61,21 @@ export default { ...@@ -61,14 +61,21 @@ export default {
61 }; 61 };
62 </script> 62 </script>
63 <style scoped lang="less"> 63 <style scoped lang="less">
64 .main { 64 .mainbox {
65 width: 100%;
65 height: 100%; 66 height: 100%;
67 -webkit-box-sizing: border-box;
68 box-sizing: border-box;
69 padding: 0;
66 .menu { 70 .menu {
67 height: 100%; 71 height: 100%;
68 /deep/ .el-tabs__content { 72 /deep/ .el-tabs__content {
69 position: unset; 73 position: unset;
70 margin-top: 40px; 74 margin-top: 40px;
71 overflow: visible; 75 overflow: visible;
76 /deep/.el-tab-pane{
77 height: calc(100% - 0px);
78 }
72 } 79 }
73 /deep/ .el-tabs__header { 80 /deep/ .el-tabs__header {
74 position: -webkit-fixed; 81 position: -webkit-fixed;
......
...@@ -666,6 +666,8 @@ export default { ...@@ -666,6 +666,8 @@ export default {
666 let hasGenerateCount = res.result.hasGenerateCount; 666 let hasGenerateCount = res.result.hasGenerateCount;
667 let unGenerateCount = res.result.unGenerateCount; 667 let unGenerateCount = res.result.unGenerateCount;
668 this.open(hasGenerateCount,unGenerateCount); 668 this.open(hasGenerateCount,unGenerateCount);
669 }else {
670 this.$message.warning(res.message)
669 } 671 }
670 } 672 }
671 ); 673 );
......
...@@ -628,6 +628,7 @@ export default { ...@@ -628,6 +628,7 @@ export default {
628 // 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件 628 // 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
629 clearTimeout(self.time); 629 clearTimeout(self.time);
630 self.time = setTimeout(() => { 630 self.time = setTimeout(() => {
631 this.closeMenu()
631 //判断点击的户是否选中 632 //判断点击的户是否选中
632 if (e.className.indexOf("tdSelect") == -1) { 633 if (e.className.indexOf("tdSelect") == -1) {
633 //未选中→选中 634 //未选中→选中
...@@ -636,7 +637,7 @@ export default { ...@@ -636,7 +637,7 @@ export default {
636 this.hqsztList.push(hs.qszt); // 将户qszt放进hqsztList 637 this.hqsztList.push(hs.qszt); // 将户qszt放进hqsztList
637 switch (this.lpbParent) { 638 switch (this.lpbParent) {
638 case 'isHbfg': 639 case 'isHbfg':
639 this.fghbChoosedList.push(hs); 640 self.fghbChoosedList.push(hs);
640 break; 641 break;
641 case 'isFwsxbg': 642 case 'isFwsxbg':
642 643
...@@ -657,7 +658,7 @@ export default { ...@@ -657,7 +658,7 @@ export default {
657 e.className = ""; 658 e.className = "";
658 switch (this.lpbParent) { 659 switch (this.lpbParent) {
659 case 'isHbfg': 660 case 'isHbfg':
660 661 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
661 break; 662 break;
662 case 'isFwsxbg': 663 case 'isFwsxbg':
663 664
...@@ -676,7 +677,7 @@ export default { ...@@ -676,7 +677,7 @@ export default {
676 break; 677 break;
677 } 678 }
678 } 679 }
679 }, 200); 680 }, 100);
680 }, 681 },
681 //户双击事件 682 //户双击事件
682 dbclick(bsm) { 683 dbclick(bsm) {
......
...@@ -553,6 +553,7 @@ ...@@ -553,6 +553,7 @@
553 saveZrzInfo(this.form).then((res)=>{ 553 saveZrzInfo(this.form).then((res)=>{
554 if(res.code===200){ 554 if(res.code===200){
555 this.$message.success("保存完成！") 555 this.$message.success("保存完成！")
556 this.getZrzDetailByBsm(this.$route.query.bsm)
556 }else { 557 }else {
557 this.$message({ 558 this.$message({
558 message: res.message, 559 message: res.message,
......