14e81702 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 52d46dc6 edf5e408
<template>
<div class="main">
<div class="mainbox1">
<template v-if="isFwsxbg">
<!-- <p class="tips">查询条件</p> -->
<el-row class="box">
......@@ -127,6 +127,7 @@
layout="prev, pager, next,total"
:total="total"
:current-page="pageNo"
:page-size="pageSize"
@current-change="handleCurrentChange"
>
</el-pagination>
......@@ -143,7 +144,6 @@
maxlength="28"
v-model="bdcdyh"
:style="{ width: inputWidth + 'px' }"
@change="inputChange"
class="searchInput"
placeholder="输入不动产单元号或室号"
><i
......@@ -389,17 +389,21 @@
lpbContentHeight: 0,
lpbContentwidth: 0,
lpbloading:true,
hbsm:''
};
},
created() {},
mounted() {
this.queryData.pageNo = this.pageNo;
this.queryData.pageSize = this.pageSize;
this.queryData.type = this.queryType;
this.getData(this.queryData);
// console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight || document.body.clientHeight) -
352;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222;
342;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 262;
});
},
methods: {
......@@ -417,16 +421,20 @@
},
// 查询
query(){
this.queryData.pageNo = this.pageNo;
this.queryData.pageSize = this.pageSize;
this.queryData.type = this.queryType;
this.getData(this.queryData)
},
// 更多查询
moreSearch(){
console.log(this.tableHeight);
if(this.ismore === true){
this.ismore = false;
this.$parent.tableHeight+=55;
this.tableHeight+=69;
}else {
this.ismore = true;
this.$parent.tableHeight-=55;
this.tableHeight-=69;
}
},
onSubmit() {},
......@@ -469,11 +477,16 @@
//点击办理
handleClick(row) {
let params = { bsm: row.bsm, type: this.queryType };
if(this.queryType == 'h'){
this.bdcdyh = row.bdcdyh;
if(row.dylx == 'h0' || row.dylx == 'h1'){
this.hbsm = row.bsm;
getQjHDetailByBsm(row.bsm).then((res)=>{
if(res.code===200){
this.zrzbsm = res.result.zrzbsm;
this.isFwsxbg = false;
this.$nextTick(()=>{
this.scyclx = row.dylx == 'h0' ? '0':'1'
})
}
})
}else{
......@@ -704,6 +717,8 @@
this.getLpbFwytAndQlxz();
this.$nextTick(()=>{
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
this.$refs.lpbContent.hbsmList.push(this.hbsm)
})
}
},
......@@ -723,17 +738,18 @@
</script>
<style scoped lang="less">
.main{
padding: 0;
.mainbox1{
width: 100%;
height: 100%;
box-sizing: border-box;
padding:20px;
background-color: #eaedf5;
.box{
background-color: white;
padding: 10px 0;
margin-bottom: 10px;
}
}
/*.main {
background-color: #eaedf5;
.tips{
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
......@@ -852,5 +868,9 @@
}
}
}
/*.main {
background-color: #eaedf5;
}*/
</style>
......
......@@ -314,7 +314,7 @@
methods: {
inputBlur(e){
if(e.target.value!==''&&e.target.value>0&&e.target.value<10){
if(e.target.value!==''&&+e.target.value>0&&+e.target.value<10){
e.target.style.border=""
}else{
e.target.style.border="1px solid red";
......@@ -424,51 +424,63 @@
data:this.form.ftxs,
name:'分摊系数',
dom:this.$refs.ftxs,
rule: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/, //非空
rule:/^(?!0(\.0{1,2})?$)(\d(\.\d{1,2})?)$/, //大于0小于10的所有保留两位的数字
},
];
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';
if(item.data !==""){
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
}
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++){
if(this.form.fwjgList[i].fwjgzdbsm===''){
this.form.fwjgList.splice(i,1);
}
}
for(let i=0;i< this.form.fwytList.length;i++){
if(this.form.fwytList[i].fwsjytbsm===''){
this.form.fwytList.splice(i,1);
}
}
for(let i=0;i< this.form.qlxzList.length;i++){
if(this.form.qlxzList[i].qlxzdm===''){
this.form.qlxzList.splice(i,1);
}
}
console.log("批量户信息")
console.log(this.form)
batchUpdateQjH(this.form).then((res)=>{
if(res.code===200){
this.lodding()
this.$message.success("保存成功!")
this.$nextTick(()=>{
this.reset();
this.$nextTick(()=> {
if (flag) {
for(let i=0;i< this.form.fwjgList.length;i++){
if(this.form.fwjgList[i].fwjgzdbsm===''){
this.form.fwjgList.splice(i,1);
}
}
for(let i=0;i< this.form.fwytList.length;i++){
if(this.form.fwytList[i].fwsjytbsm===''){
this.form.fwytList.splice(i,1);
}
}
for(let i=0;i< this.form.qlxzList.length;i++){
if(this.form.qlxzList[i].qlxzdm===''){
this.form.qlxzList.splice(i,1);
}
}
console.log("批量户信息")
console.log(this.form)
batchUpdateQjH(this.form).then((res)=>{
if(res.code===200){
this.lodding()
this.$message.success("保存成功!")
this.$nextTick(()=>{
this.reset();
})
this.close();
}
})
this.close();
}else{
this.$message({
// message: item.name+'不能为空',
message: '表单数据有误',
type: "warning",
});
}
})
},
......
<template>
<div class="main">
<div class="mainbox">
<el-tabs v-model="tabName" @tab-click="handleClick" class="menu">
<el-tab-pane label="宗地" name="zd">
<fwsxbg-tab queryType="zd"></fwsxbg-tab>
......@@ -61,14 +61,21 @@ export default {
};
</script>
<style scoped lang="less">
.main {
.mainbox {
width: 100%;
height: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 0;
.menu {
height: 100%;
/deep/ .el-tabs__content {
position: unset;
margin-top: 40px;
overflow: visible;
/deep/.el-tab-pane{
height: calc(100% - 0px);
}
}
/deep/ .el-tabs__header {
position: -webkit-fixed;
......
......@@ -666,6 +666,8 @@ export default {
let hasGenerateCount = res.result.hasGenerateCount;
let unGenerateCount = res.result.unGenerateCount;
this.open(hasGenerateCount,unGenerateCount);
}else {
this.$message.warning(res.message)
}
}
);
......
......@@ -628,6 +628,7 @@ export default {
// 开启延时器,200ms的间隔区分单击和双击,解决双击时执行两次单击事件
clearTimeout(self.time);
self.time = setTimeout(() => {
this.closeMenu()
//判断点击的户是否选中
if (e.className.indexOf("tdSelect") == -1) {
//未选中→选中
......@@ -636,7 +637,7 @@ export default {
this.hqsztList.push(hs.qszt); // 将户qszt放进hqsztList
switch (this.lpbParent) {
case 'isHbfg':
this.fghbChoosedList.push(hs);
self.fghbChoosedList.push(hs);
break;
case 'isFwsxbg':
......@@ -657,7 +658,7 @@ export default {
e.className = "";
switch (this.lpbParent) {
case 'isHbfg':
self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
break;
case 'isFwsxbg':
......@@ -676,7 +677,7 @@ export default {
break;
}
}
}, 200);
}, 100);
},
//户双击事件
dbclick(bsm) {
......
......@@ -553,6 +553,7 @@
saveZrzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存完成!")
this.getZrzDetailByBsm(this.$route.query.bsm)
}else {
this.$message({
message: res.message,
......