958291e0 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 1a473d3d a8f2f934
......@@ -248,8 +248,7 @@ export default {
default:
break;
}
if(item.type){
if(item.type == 'zd' ||item.type == 'dz' ||item.type == 'zrz'){
this.$router.push({
path: '/'+item.type,
query:{
......
......@@ -25,7 +25,7 @@
<td colspan="2">其他建筑面积(㎡)</td>
<td colspan="4"><input type="text" v-model="form.qtjzmj" class="inputtitle"/></td>
<td colspan="2">分摊系数</td>
<td colspan="4"><input type="text" v-model="form.ftxs" class="inputtitle"/></td>
<td colspan="4"><input type="number" @blur="inputBlur($event)" ref="ftxs" v-model="form.ftxs" class="inputtitle"/></td>
</tr>
<tr>
<td colspan="2">户型</td>
......@@ -315,6 +315,16 @@
}
},
methods: {
inputBlur(e){
if(e.target.value!==''&&e.target.value>0&&e.target.value<10){
e.target.style.border=""
}else{
e.target.style.border="1px solid red";
e.target.style.boxSizing = 'border-box';
}
},
lodding:function(){
this.$emit('lodding')
},
......@@ -411,6 +421,30 @@
this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
},
save: function () {
this.rules=[
{
data:this.form.ftxs,
name:'分摊系数',
dom:this.$refs.ftxs,
rule: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/, //非空
},
];
let flag = true;
this.rules.forEach(item=>{
if(item.rule.test(item.data) || item.data == null){
if(item.dom.$el){
item.dom.$el.style.border = '1px solid red';
item.dom.$el.style.boxSizing = 'border-box';
}else{
item.dom.style.border = '1px solid red';
item.dom.style.boxSizing = 'border-box';
}
flag = false;
return false
}
})
this.form['hbsms'] = this.bsms
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
for(let i=0;i< this.form.fwjgList.length;i++){
......
......@@ -342,7 +342,7 @@ export default {
bdcdyh:'',
bdcqzh:'',
pageNo:1,
pageSize:10,
pageSize:15,
type:'all'
};
this.search()
......@@ -514,7 +514,7 @@ export default {
if (n) {
this.lpbContentwidth -= 204;
} else {
this.lpbContentwidth += 204;
this.lpbContentwidth += 200;
}
},
//选择自然幢展示楼盘表后,查询右侧图例数据
......@@ -522,9 +522,10 @@ export default {
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
this.$nextTick(()=>{
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
})
// console.log(this.$refs.lpbContentWrap.clientWidth,'lpbContentWrap');
// this.$nextTick(()=>{
// this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
// })
}
},
//改变syclx,更新楼盘表数据
......
......@@ -179,6 +179,7 @@
updateQsztByBsm(data)
.then((res => {
if (res.code == 200) {
this.$store.state.oldZdbsm = '';
switch (row.dylx) {
case "zd":
this.$store.state.zdbsm = row.glbsm;
......
......@@ -14,7 +14,7 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
<el-table-column prop="bdcdyh" align="left" width="260" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
</el-table-column>
......@@ -25,7 +25,7 @@
{{scope.row.dylx | bdcLxFilter}}
</template>
</el-table-column>
<el-table-column prop="qsztValue" align="left" label="权属状态">
<el-table-column prop="qsztValue" align="left" width="100" label="权属状态">
</el-table-column>
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
......
......@@ -55,7 +55,7 @@
</td>
<td colspan="2" class="tdright">地籍子区</td>
<td colspan="2">
<el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.djzqbsm">
<el-select class="formSelect" @change="changeDjzq" :disabled="formData.qszt!='0'" v-model="formData.djzqbsm">
<el-option
v-for="item in $store.state.djzqList"
:key="item.bsm"
......@@ -839,6 +839,7 @@
if (res.code === 200) {
this.$message.success("提交成功!")
this.getZdjbxxData(this.curZdbsm);
this.$store.state.oldZdbsm = '';
this.getRightTree(this.curZdbsm,'0,1,2')
}
})
......@@ -858,6 +859,7 @@
this.formData.djzqbsm = "";
this.djqList = res.result;
this.$store.state.djqList = res.result;
this.generatorDpdm();
})
.catch((error) => {
});
......@@ -868,10 +870,14 @@
this.formData.djzqbsm = "";
this.djzqList = res.result;
this.$store.state.djzqList = res.result;
this.generatorDpdm();
})
.catch((error) => {
});
},
changeDjzq() {
this.generatorDpdm();
},
//判断容密高是否为区间
isInterval(val) {
if (val == '>' || val == '<' || val == '=' || val == '>=' || val == '<=' || val == null) {
......
......@@ -526,7 +526,6 @@
},
created(){
let bsm=this.$store.state.hbsm
// console.log(bsm,'户BSM')
if (bsm) {
this.getHInfo(bsm);
}
......@@ -705,7 +704,6 @@
},
//保存户信息
onSave(){
this.form.bsm=this.$store.state.hbsm;
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
if(this.form.scyclx==='0'){
this.form.jzmj = this.form.ycjzmj;
......
......@@ -322,6 +322,8 @@ export default {
this.$parent.$parent.getLpbMenuTree(bsm);
//关闭弹框
this.$parent.$parent.closeDaialog();
}else{
this.$message.error(res.message);
}
});
},
......
......@@ -599,6 +599,7 @@
if(res.code===200){
this.$message.success("提交完成!");
this.getZrzDetailByBsm(this.$route.query.bsm);
this.$store.state.oldZdbsm = '';
this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2')
}else{
this.$message.error(res.message);
......