14e81702 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 52d46dc6 edf5e408
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,17 +738,18 @@ ...@@ -723,17 +738,18 @@
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 } 752 .tips{
734 /*.main {
735 background-color: #eaedf5;
736 .tips{
737 color: #9B9B9B; 753 color: #9B9B9B;
738 margin-left: 2px; 754 margin-left: 2px;
739 margin-bottom: 10px; 755 margin-bottom: 10px;
...@@ -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,51 +424,63 @@ ...@@ -424,51 +424,63 @@
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.dom.$el){ 433 if(!item.rule.test(+item.data) || item.data == null){
434 item.dom.$el.style.border = '1px solid red'; 434 if(item.dom.$el){
435 item.dom.$el.style.boxSizing = 'border-box'; 435 item.dom.$el.style.border = '1px solid red';
436 }else{ 436 item.dom.$el.style.boxSizing = 'border-box';
437 item.dom.style.border = '1px solid red'; 437 }else{
438 item.dom.style.boxSizing = 'border-box'; 438 item.dom.style.border = '1px solid red';
439 item.dom.style.boxSizing = 'border-box';
440 }
441 flag = false;
442 return false
439 } 443 }
440 flag = false;
441 return false
442 } 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();
447 for(let i=0;i< this.form.fwjgList.length;i++){ 449 this.$nextTick(()=> {
448 if(this.form.fwjgList[i].fwjgzdbsm===''){ 450 if (flag) {
449 this.form.fwjgList.splice(i,1); 451 for(let i=0;i< this.form.fwjgList.length;i++){
450 } 452 if(this.form.fwjgList[i].fwjgzdbsm===''){
451 } 453 this.form.fwjgList.splice(i,1);
452 for(let i=0;i< this.form.fwytList.length;i++){ 454 }
453 if(this.form.fwytList[i].fwsjytbsm===''){ 455 }
454 this.form.fwytList.splice(i,1); 456 for(let i=0;i< this.form.fwytList.length;i++){
455 } 457 if(this.form.fwytList[i].fwsjytbsm===''){
456 } 458 this.form.fwytList.splice(i,1);
457 for(let i=0;i< this.form.qlxzList.length;i++){ 459 }
458 if(this.form.qlxzList[i].qlxzdm===''){ 460 }
459 this.form.qlxzList.splice(i,1); 461 for(let i=0;i< this.form.qlxzList.length;i++){
460 } 462 if(this.form.qlxzList[i].qlxzdm===''){
461 } 463 this.form.qlxzList.splice(i,1);
462 console.log("批量户信息") 464 }
463 console.log(this.form) 465 }
464 batchUpdateQjH(this.form).then((res)=>{ 466 console.log("批量户信息")
465 if(res.code===200){ 467 console.log(this.form)
466 this.lodding() 468 batchUpdateQjH(this.form).then((res)=>{
467 this.$message.success("保存成功!") 469 if(res.code===200){
468 this.$nextTick(()=>{ 470 this.lodding()
469 this.reset(); 471 this.$message.success("保存成功!")
472 this.$nextTick(()=>{
473 this.reset();
474 })
475 this.close();
476 }
470 }) 477 })
471 this.close(); 478 }else{
479 this.$message({
480 // message: item.name+'不能为空',
481 message: '表单数据有误',
482 type: "warning",
483 });
472 } 484 }
473 }) 485 })
474 }, 486 },
......
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;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> 21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
23 <td colspan="4" class="psr"> 23 <td colspan="4" class="psr">
24 <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag"></el-input> 24 <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh" @blur="inputBlur($event)"></el-input>
25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> 25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
26 </td> 26 </td>
27 <td colspan="2" align="center" >原不动产单元</td> 27 <td colspan="2" align="center" >原不动产单元</td>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 <tr height="30"> 66 <tr height="30">
67 <td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td> 67 <td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td>
68 <td colspan="4" > 68 <td colspan="4" >
69 <el-select v-model="form.fwlxbsm" placeholder="请选择" :disabled="disableFlag"> 69 <el-select v-model="form.fwlxbsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwlxbsm">
70 <el-option 70 <el-option
71 v-for="item in $store.state.fwlxList" 71 v-for="item in $store.state.fwlxList"
72 :key="item.bsm" 72 :key="item.bsm"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 </td> 77 </td>
78 <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td> 78 <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
79 <td colspan="4" > 79 <td colspan="4" >
80 <el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag"> 80 <el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwxzbsm">
81 <el-option 81 <el-option
82 v-for="item in $store.state.fwxzOptions" 82 v-for="item in $store.state.fwxzOptions"
83 :key="item.bsm" 83 :key="item.bsm"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 <tr height="30"> 127 <tr height="30">
128 <td colspan="2" align="center" >产别<i class="requisite">*</i></td> 128 <td colspan="2" align="center" >产别<i class="requisite">*</i></td>
129 <td colspan="4" > 129 <td colspan="4" >
130 <el-select v-model="form.fwcbbsm" placeholder="请选择" :disabled="disableFlag"> 130 <el-select v-model="form.fwcbbsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwcbbsm">
131 <el-option 131 <el-option
132 v-for="item in $store.state.cbOptions" 132 v-for="item in $store.state.cbOptions"
133 :key="item.bsm" 133 :key="item.bsm"
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
138 </td> 138 </td>
139 <td colspan="2" align="center" >产权来源<i class="requisite">*</i></td> 139 <td colspan="2" align="center" >产权来源<i class="requisite">*</i></td>
140 <td colspan="4" > 140 <td colspan="4" >
141 <el-select v-model="form.fwcqlybsm" placeholder="请选择" :disabled="disableFlag"> 141 <el-select v-model="form.fwcqlybsm" placeholder="请选择" :disabled="disableFlag" @blur="inputBlur($event)" ref="fwcqlybsm">
142 <el-option 142 <el-option
143 v-for="item in $store.state.cqlyOptions" 143 v-for="item in $store.state.cqlyOptions"
144 :key="item.bsm" 144 :key="item.bsm"
...@@ -204,11 +204,11 @@ ...@@ -204,11 +204,11 @@
204 <tr height="30"> 204 <tr height="30">
205 <td colspan="2" align="center" >分摊系数</td> 205 <td colspan="2" align="center" >分摊系数</td>
206 <td colspan="2" align="center" > 206 <td colspan="2" align="center" >
207 <el-input v-model="form.ycftxs" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> 207 <el-input v-model="form.ycftxs" type="number" :disabled="form.scyclx==='1'||disableFlag" @blur="inputFtxsBlur($event)" ref="ycftxs"></el-input>
208 </td> 208 </td>
209 <td colspan="2" align="center" >分摊系数</td> 209 <td colspan="2" align="center" >分摊系数</td>
210 <td colspan="2" align="center" > 210 <td colspan="2" align="center" >
211 <el-input v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> 211 <el-input v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs"></el-input>
212 </td> 212 </td>
213 </tr> 213 </tr>
214 214
...@@ -236,6 +236,7 @@ ...@@ -236,6 +236,7 @@
236 </td> 236 </td>
237 <td width="30" colspan="4" align="center" > 237 <td width="30" colspan="4" align="center" >
238 <el-select-tree 238 <el-select-tree
239 ref="ghyt"
239 v-if="show" 240 v-if="show"
240 :default-expand-all="defaultExpandAll" 241 :default-expand-all="defaultExpandAll"
241 @change="updateSjfyyt(item1)" 242 @change="updateSjfyyt(item1)"
...@@ -252,6 +253,7 @@ ...@@ -252,6 +253,7 @@
252 <td width="30" colspan="1" align="center" >用途</td> 253 <td width="30" colspan="1" align="center" >用途</td>
253 <td width="30" colspan="4" align="center" > 254 <td width="30" colspan="4" align="center" >
254 <el-select-tree 255 <el-select-tree
256 ref="yt"
255 v-if="show" 257 v-if="show"
256 :default-expand-all="defaultExpandAll" 258 :default-expand-all="defaultExpandAll"
257 :multiple="multiple" 259 :multiple="multiple"
...@@ -282,7 +284,7 @@ ...@@ -282,7 +284,7 @@
282 <span @click="deleteFwjgInfo(index)">删除</span> 284 <span @click="deleteFwjgInfo(index)">删除</span>
283 </td> 285 </td>
284 <td colspan="9" > 286 <td colspan="9" >
285 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag"> 287 <el-select v-model="item1.fwjgzdbsm" ref="fwjg" placeholder="请选择" :disabled="disableFlag">
286 <el-option 288 <el-option
287 v-for="item in $store.state.jgOptions" 289 v-for="item in $store.state.jgOptions"
288 :key="item.bsm" 290 :key="item.bsm"
...@@ -325,7 +327,7 @@ ...@@ -325,7 +327,7 @@
325 <span>坐落<i class="requisite">*</i></span> 327 <span>坐落<i class="requisite">*</i></span>
326 </td> 328 </td>
327 <td colspan="10" > 329 <td colspan="10" >
328 <el-input v-model="form.zl" :disabled="disableFlag"></el-input> 330 <el-input v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag"></el-input>
329 </td> 331 </td>
330 </tr> 332 </tr>
331 333
...@@ -523,6 +525,9 @@ ...@@ -523,6 +525,9 @@
523 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 525 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
524 formHeight:0, 526 formHeight:0,
525 mainBoxWidth:0, 527 mainBoxWidth:0,
528
529 rules:[],
530 ftxsrules:[],
526 } 531 }
527 }, 532 },
528 created(){ 533 created(){
...@@ -537,6 +542,25 @@ ...@@ -537,6 +542,25 @@
537 }) 542 })
538 }, 543 },
539 methods: { 544 methods: {
545
546 inputFtxsBlur(e){
547 if(e.target.value!==''&&+e.target.value>0&&+e.target.value<10){
548 e.target.style.border=""
549 }else{
550 e.target.style.border="1px solid red";
551 e.target.style.boxSizing = 'border-box';
552 }
553 },
554
555 inputBlur(e){
556 if(e.target.value!=''){
557 e.target.style.border=""
558 }else{
559 e.target.style.border="1px solid red";
560 e.target.style.boxSizing = 'border-box';
561 }
562 },
563
540 registerCall(){ 564 registerCall(){
541 let data={ 565 let data={
542 type:'h', 566 type:'h',
...@@ -709,29 +733,161 @@ ...@@ -709,29 +733,161 @@
709 }, 733 },
710 //保存户信息 734 //保存户信息
711 onSave(){ 735 onSave(){
712 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 736
713 if(this.form.scyclx==='0'){ 737 if(this.form.scyclx === '0'){
714 this.form.jzmj = this.form.ycjzmj; 738 this.ftxsrules=[
715 this.form.tnjzmj=this.form.yctnjzmj; 739 {
716 this.form.ftjzmj=this.form.ycftjzmj; 740 data:this.form.ycftxs,
717 this.form.dxbfjzmj=this.form.ycdxbfjzmj; 741 name:'不动产单元号',
718 this.form.qtjzmj=this.form.ycqtjzmj; 742 dom:this.$refs.ycftxs,
719 this.form.ftxs=this.form.ycftxs; 743 rule:/^(?!0(\.0{1,2})?$)(\d(\.\d{1,2})?)$/, //大于0小于10的所有保留两位的数字
720 }else if(this.form.scyclx==='1'){ 744 },
721 this.form.jzmj = this.form.scjzmj; 745 ]
722 this.form.tnjzmj=this.form.sctnjzmj; 746 }else {
723 this.form.ftjzmj=this.form.scftjzmj; 747 this.ftxsrules=[
724 this.form.dxbfjzmj=this.form.scdxbfjzmj; 748 {
725 this.form.qtjzmj=this.form.scqtjzmj; 749 data:this.form.scftxs,
726 this.form.ftxs=this.form.scftxs; 750 name:'不动产单元号',
751 dom:this.$refs.scftxs,
752 rule:/^(?!0(\.0{1,2})?$)(\d(\.\d{1,2})?)$/, //大于0小于10的所有保留两位的数字
753 },
754 ]
727 } 755 }
728 updateQjH(this.form).then((res)=>{ 756
729 if(res.code===200){ 757
730 this.$message.success("保存成功!") 758 this.rules=[
759 {
760 data:this.form.bdcdyh,
761 name:'不动产单元号',
762 dom:this.$refs.bdcdyh,
763 rule: /^\s*$/g, //非空
764 },
765 {
766 data:this.form.fwlxbsm,
767 name:'房屋类型',
768 dom:this.$refs.fwlxbsm,
769 rule: /^\s*$/g, //非空
770 },
771 {
772 data:this.form.fwxzbsm,
773 name:'房屋性质',
774 dom:this.$refs.fwxzbsm,
775 rule: /^\s*$/g, //非空
776 },
777 {
778 data:this.form.fwcbbsm,
779 name:'产别',
780 dom:this.$refs.fwcbbsm,
781 rule: /^\s*$/g, //非空
782 },
783 {
784 data:this.form.fwcqlybsm,
785 name:'产权来源',
786 dom:this.$refs.fwcqlybsm,
787 rule: /^\s*$/g, //非空
788 },
789 {
790 data:this.form.zl,
791 name:'坐落',
792 dom:this.$refs.zl,
793 rule: /^\s*$/g, //非空
794 },
795 ]
796 this.form.fwytList.forEach((item,index)=>{
797 this.rules.push(
798 {
799 data:item.fwytzdbsm,
800 name:'规划用途',
801 dom:this.$refs.ghyt[index],
802 rule: /^\s*$/g, //非空
803 },
804 {
805 data:item.fwytzdbsm,
806 name:'用途',
807 dom:this.$refs.yt[index],
808 rule: /^\s*$/g, //非空
809 },
810 )
811 })
812 this.form.fwjgList.forEach((item,index)=>{
813 this.rules.push(
814 {
815 data:item.fwjgzdbsm,
816 name:'房屋结构',
817 dom:this.$refs.fwjg[index],
818 rule: /^\s*$/g, //非空
819 },
820 )
821 })
822 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
823 this.$refs.qlxzModule.getRules();
824 let flag = true;
825
826 this.rules.forEach(item=>{
827 if(item.rule.test(item.data) || item.data == null){
828 if(item.dom.$el){
829 item.dom.$el.style.border = '1px solid red';
830 item.dom.$el.style.boxSizing = 'border-box';
831 }else{
832 item.dom.style.border = '1px solid red';
833 item.dom.style.boxSizing = 'border-box';
834 }
835 flag = false;
836 return false
837 }
838 })
839
840 let ftxsflag = true;
841
842 this.ftxsrules.forEach(item=>{
843 if(item.data !==""){
844 if(!item.rule.test(+item.data) || item.data == null){
845 if(item.dom.$el){
846 item.dom.$el.style.border = '1px solid red';
847 item.dom.$el.style.boxSizing = 'border-box';
848 }else{
849 item.dom.style.border = '1px solid red';
850 item.dom.style.boxSizing = 'border-box';
851 }
852 ftxsflag = false;
853 return false
854 }
855 }
856 })
857
858 this.$nextTick(()=> {
859 if (flag && ftxsflag && this.$refs.qlxzModule.getRulesResult()) {
860 if(this.form.scyclx==='0'){
861 this.form.jzmj = this.form.ycjzmj;
862 this.form.tnjzmj=this.form.yctnjzmj;
863 this.form.ftjzmj=this.form.ycftjzmj;
864 this.form.dxbfjzmj=this.form.ycdxbfjzmj;
865 this.form.qtjzmj=this.form.ycqtjzmj;
866 this.form.ftxs=this.form.ycftxs;
867 }else if(this.form.scyclx==='1'){
868 this.form.jzmj = this.form.scjzmj;
869 this.form.tnjzmj=this.form.sctnjzmj;
870 this.form.ftjzmj=this.form.scftjzmj;
871 this.form.dxbfjzmj=this.form.scdxbfjzmj;
872 this.form.qtjzmj=this.form.scqtjzmj;
873 this.form.ftxs=this.form.scftxs;
874 }
875 updateQjH(this.form).then((res)=>{
876 if(res.code===200){
877 this.$message.success("保存成功!")
878 }else {
879 this.$message.warning(res.message)
880 }
881 })
731 }else { 882 }else {
732 this.$message.warning(res.message) 883 this.$message({
884 // message: item.name+'不能为空',
885 message: '表单数据有误',
886 type: "warning",
887 });
733 } 888 }
734 }) 889 })
890
735 }, 891 },
736 onSubmit(){ 892 onSubmit(){
737 let data={ 893 let data={
...@@ -853,6 +1009,62 @@ ...@@ -853,6 +1009,62 @@
853 }) 1009 })
854 } 1010 }
855 }, 1011 },
1012
1013 "form.bdcdyh":function (val) {
1014 if (val != '') {
1015 this.$refs.bdcdyh.style.border = '';
1016 }
1017 },
1018
1019 "form.fwlxbsm":{
1020 handler:function (val) {
1021 if (val != '') {
1022 this.$refs.fwlxbsm.$el.style.border = '';
1023 }
1024 },
1025 immediate:false
1026 },
1027
1028 "form.fwcqlybsm":{
1029 handler:function (val) {
1030 if (val != '') {
1031 this.$refs.fwcqlybsm.$el.style.border = '';
1032 }
1033 },
1034 immediate:false
1035 },
1036
1037 "form.fwcbbsm":{
1038 handler:function (val) {
1039 if (val != '') {
1040 this.$refs.fwcbbsm.$el.style.border = '';
1041 }
1042 },
1043 immediate:false
1044 },
1045
1046 "form.fwytList": {
1047 handler : function (newVal, oldVal) {
1048 newVal.forEach((item,ind)=>{
1049 if(item.fwytzdbsm != ''){
1050 this.$refs.ghyt[ind].$el.style.border=""
1051 this.$refs.yt[ind].$el.style.border=""
1052 }
1053 })
1054 },
1055 deep:true
1056 },
1057 "form.fwjgList": {
1058 handler : function (newVal, oldVal) {
1059 newVal.forEach((item,ind)=>{
1060 if(item.fwjgzdbsm != ''){
1061 this.$refs.fwjg[ind].$el.style.border=""
1062 }
1063 })
1064 },
1065 deep:true
1066 },
1067
856 "$store.state.sxdrType": { 1068 "$store.state.sxdrType": {
857 handler(n) { 1069 handler(n) {
858 this.$nextTick(()=>{ 1070 this.$nextTick(()=>{
......
...@@ -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,
......