Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
958291e0 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 1a473d3d a8f2f934
Inline Side-by-side
Showing 9 changed files with 55 additions and 13 deletions
...@@ -248,8 +248,7 @@ export default { ...@@ -248,8 +248,7 @@ export default {
248 default: 248 default:
249 break; 249 break;
250 } 250 }
251 251 if(item.type == 'zd' ||item.type == 'dz' ||item.type == 'zrz'){
252 if(item.type){
253 this.$router.push({ 252 this.$router.push({
254 path: '/'+item.type, 253 path: '/'+item.type,
255 query:{ 254 query:{
......
...@@ -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>
...@@ -315,6 +315,16 @@ ...@@ -315,6 +315,16 @@
315 } 315 }
316 }, 316 },
317 methods: { 317 methods: {
318
319 inputBlur(e){
320 if(e.target.value!==''&&e.target.value>0&&e.target.value<10){
321 e.target.style.border=""
322 }else{
323 e.target.style.border="1px solid red";
324 e.target.style.boxSizing = 'border-box';
325 }
326 },
327
318 lodding:function(){ 328 lodding:function(){
319 this.$emit('lodding') 329 this.$emit('lodding')
320 }, 330 },
...@@ -411,6 +421,30 @@ ...@@ -411,6 +421,30 @@
411 this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量 421 this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
412 }, 422 },
413 save: function () { 423 save: function () {
424
425 this.rules=[
426 {
427 data:this.form.ftxs,
428 name:'分摊系数',
429 dom:this.$refs.ftxs,
430 rule: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/, //非空
431 },
432 ];
433 let flag = true;
434 this.rules.forEach(item=>{
435 if(item.rule.test(item.data) || item.data == null){
436 if(item.dom.$el){
437 item.dom.$el.style.border = '1px solid red';
438 item.dom.$el.style.boxSizing = 'border-box';
439 }else{
440 item.dom.style.border = '1px solid red';
441 item.dom.style.boxSizing = 'border-box';
442 }
443 flag = false;
444 return false
445 }
446 })
447
414 this.form['hbsms'] = this.bsms 448 this.form['hbsms'] = this.bsms
415 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 449 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
416 for(let i=0;i< this.form.fwjgList.length;i++){ 450 for(let i=0;i< this.form.fwjgList.length;i++){
......
...@@ -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，更新楼盘表数据
......
...@@ -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>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 </td> 55 </td>
56 <td colspan="2" class="tdright">地籍子区</td> 56 <td colspan="2" class="tdright">地籍子区</td>
57 <td colspan="2"> 57 <td colspan="2">
58 <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.djzqbsm"> 58 <el-select class="formSelect" @change="changeDjzq" :disabled="formData.qszt!='0'" v-model="formData.djzqbsm">
59 <el-option 59 <el-option
60 v-for="item in $store.state.djzqList" 60 v-for="item in $store.state.djzqList"
61 :key="item.bsm" 61 :key="item.bsm"
...@@ -839,6 +839,7 @@ ...@@ -839,6 +839,7 @@
839 if (res.code === 200) { 839 if (res.code === 200) {
840 this.$message.success("提交成功！") 840 this.$message.success("提交成功！")
841 this.getZdjbxxData(this.curZdbsm); 841 this.getZdjbxxData(this.curZdbsm);
842 this.$store.state.oldZdbsm = '';
842 this.getRightTree(this.curZdbsm,'0,1,2') 843 this.getRightTree(this.curZdbsm,'0,1,2')
843 } 844 }
844 }) 845 })
...@@ -858,6 +859,7 @@ ...@@ -858,6 +859,7 @@
858 this.formData.djzqbsm = ""; 859 this.formData.djzqbsm = "";
859 this.djqList = res.result; 860 this.djqList = res.result;
860 this.$store.state.djqList = res.result; 861 this.$store.state.djqList = res.result;
862 this.generatorDpdm();
861 }) 863 })
862 .catch((error) => { 864 .catch((error) => {
863 }); 865 });
...@@ -868,10 +870,14 @@ ...@@ -868,10 +870,14 @@
868 this.formData.djzqbsm = ""; 870 this.formData.djzqbsm = "";
869 this.djzqList = res.result; 871 this.djzqList = res.result;
870 this.$store.state.djzqList = res.result; 872 this.$store.state.djzqList = res.result;
873 this.generatorDpdm();
871 }) 874 })
872 .catch((error) => { 875 .catch((error) => {
873 }); 876 });
874 }, 877 },
878 changeDjzq() {
879 this.generatorDpdm();
880 },
875 //判断容密高是否为区间 881 //判断容密高是否为区间
876 isInterval(val) { 882 isInterval(val) {
877 if (val == '>' || val == '<' || val == '=' || val == '>=' || val == '<=' || val == null) { 883 if (val == '>' || val == '<' || val == '=' || val == '>=' || val == '<=' || val == null) {
......
...@@ -526,7 +526,6 @@ ...@@ -526,7 +526,6 @@
526 }, 526 },
527 created(){ 527 created(){
528 let bsm=this.$store.state.hbsm 528 let bsm=this.$store.state.hbsm
529 // console.log(bsm,'户BSM')
530 if (bsm) { 529 if (bsm) {
531 this.getHInfo(bsm); 530 this.getHInfo(bsm);
532 } 531 }
...@@ -705,7 +704,6 @@ ...@@ -705,7 +704,6 @@
705 }, 704 },
706 //保存户信息 705 //保存户信息
707 onSave(){ 706 onSave(){
708 this.form.bsm=this.$store.state.hbsm;
709 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 707 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
710 if(this.form.scyclx==='0'){ 708 if(this.form.scyclx==='0'){
711 this.form.jzmj = this.form.ycjzmj; 709 this.form.jzmj = this.form.ycjzmj;
......
...@@ -322,6 +322,8 @@ export default { ...@@ -322,6 +322,8 @@ export default {
322 this.$parent.$parent.getLpbMenuTree(bsm); 322 this.$parent.$parent.getLpbMenuTree(bsm);
323 //关闭弹框 323 //关闭弹框
324 this.$parent.$parent.closeDaialog(); 324 this.$parent.$parent.closeDaialog();
325 }else{
326 this.$message.error(res.message);
325 } 327 }
326 }); 328 });
327 }, 329 },
......
...@@ -599,6 +599,7 @@ ...@@ -599,6 +599,7 @@
599 if(res.code===200){ 599 if(res.code===200){
600 this.$message.success("提交完成！"); 600 this.$message.success("提交完成！");
601 this.getZrzDetailByBsm(this.$route.query.bsm); 601 this.getZrzDetailByBsm(this.$route.query.bsm);
602 this.$store.state.oldZdbsm = '';
602 this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2') 603 this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2')
603 }else{ 604 }else{
604 this.$message.error(res.message); 605 this.$message.error(res.message);
......