b266090b by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 69815c61 89c35c2d
......@@ -284,6 +284,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@blur="inputBlur($event,true)"
@input="startTime(index,childIndex)"
>
</el-date-picker>
......@@ -332,6 +333,7 @@
value-format="yyyy-MM-dd"
:picker-options="childItem.pickerEnd"
placeholder="选择日期"
@blur="inputBlur($event,true)"
@input="endTime(index,childIndex)"
>
</el-date-picker>
......
......@@ -2,7 +2,7 @@
<div ref="lpb" class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
<el-tab-pane label="业主共有" name="yzgy"><yzgy></yzgy></el-tab-pane>
<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
......@@ -28,6 +28,7 @@ export default {
return {
activeName: "zrzxx",
lpbLoad:false, //默认不加载楼盘表组件
yzgyLoad:false,
};
},
methods: {
......@@ -35,6 +36,9 @@ export default {
if(!this.lpbLoad){
this.lpbLoad = tab.name == 'lpb' ? true : false
}
if(!this.yzgyLoad){
this.yzgyLoad = tab.name == 'yzgy' ? true : false
}
},
},
created() {},
......
<template>
<div class="">
<div class="main">
<div class="main" ref="mainBox">
<table border="1">
<tr>
<td colspan="3">宗地代码</td>
......@@ -54,9 +53,11 @@
<td>{{sumFttdmj}}</td>
</tr>-->
</table>
<div class="pers">
<!-- <div class="pers">
<el-button @click="save" type="primary">保存</el-button>
</div>
</div> -->
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div>
</template>
......@@ -83,7 +84,8 @@
fttdmj: '', //分摊土地面积
fj: ''
}]
}
},
mainBoxWidth:0
}
},
......@@ -127,10 +129,12 @@
console.log("create init...")
},
mounted() {
console.log("mounted init...")
// console.log(this.$refs.mainBox.clientWidth,"this.$refs.mainBox.clientWidth")
this.Data.glbsm = this.$store.state.zrzbsm
this.zddm = this.$store.state.zddm
this.getData(this.Data.glbsm)
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
watch: {
"$store.state.zdbsm": function (bsm) {
......@@ -147,7 +151,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
}
table {
......@@ -186,4 +190,22 @@
.dzwsl {
width: 200px;
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: 0;
text-align: center;
background-color: #ffffff;
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
</style>
......
<template>
<div class="main">
<div class="main" ref="mainBox">
<div class="formMenu">
<Qlr ref="qlrxxModule" :bsm="bsm" :qszt="form.qszt"></Qlr>
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable">
......@@ -43,7 +43,7 @@
<tr>
<td colspan="2" >房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-select class="formSelect" ref="fwxz" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" >
<el-select class="formSelect" ref="fwxz" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -156,7 +156,6 @@
<td colspan="3" >
<el-select-tree style="width:100%"
ref="ghyt"
@blur="inputBlur($event)"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -173,7 +172,6 @@
<td colspan="4" >
<el-select-tree style="width:100%"
ref="yt"
@blur="inputBlur($event)"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -198,7 +196,7 @@
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
</td>
<td colspan="9" >
<el-select class="persent78" ref="fwjg" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-select class="persent78" ref="fwjg" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.jgOptions"
:key="item.bsm"
......@@ -266,10 +264,11 @@
</tr>
</table>
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
</div>
</div>
......@@ -398,6 +397,7 @@
BSM:"",
},
rules:[],
mainBoxWidth:0,
}
},
methods: {
......@@ -491,13 +491,13 @@
this.form.fwytList.forEach((item,index)=>{
this.rules.push(
{
data:this.form.fwytList[index].ghyt,
data:item.fwytzdbsm,
name:'规划用途',
dom:this.$refs.ghyt[index],
rule: /^\s*$/g, //非空
},
{
data:this.form.fwytList[index].yt,
data:item.fwytzdbsm,
name:'用途',
dom:this.$refs.yt[index],
rule: /^\s*$/g, //非空
......@@ -507,7 +507,7 @@
this.form.fwjgList.forEach((item,index)=>{
this.rules.push(
{
data:this.form.fwjgList[index].fwjg,
data:item.fwjgzdbsm,
name:'房屋结构',
dom:this.$refs.fwjg[index],
rule: /^\s*$/g, //非空
......@@ -717,7 +717,11 @@
this.getZrzDetailByBsm(this.$route.query.bsm)
}
},
mounted() {},
mounted() {
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
computed: {
zrzbsm() {
return this.$store.state.zdbsm;
......@@ -726,7 +730,46 @@
watch:{
zrzbsm:function (val) {
this.reload()
},
"form.bdcdyh":function (val) {
if (val != '') {
this.$refs.bdcdyh.style.border = '';
}
},
"form.zrzh":function (val) {
if (val != '') {
this.$refs.zrzh.style.border = '';
}
},
"form.fwxzbsm":{
handler:function (val) {
if (val != '') {
this.$refs.fwxz.$el.style.border = '';
}
},
immediate:false
},
"form.fwytList": {
handler : function (newVal, oldVal) {
newVal.forEach((item,ind)=>{
if(item.fwytzdbsm != ''){
this.$refs.ghyt[ind].$el.style.border=""
this.$refs.yt[ind].$el.style.border=""
}
})
},
deep:true
},
"form.fwjgList": {
handler : function (newVal, oldVal) {
newVal.forEach((item,ind)=>{
if(item.fwjgzdbsm != ''){
this.$refs.fwjg[ind].$el.style.border=""
}
})
},
deep:true
},
}
}
</script>
......@@ -738,6 +781,7 @@
.formMenu {
width: 100%;
margin: 0 auto;
margin-bottom: 50px;
}
.zrzTable {
margin: 10px 0;
......@@ -791,5 +835,26 @@
width: 100%;
}
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: 6px;
text-align: center;
background-color: #ffffff;
.el-button{
padding: 10px 30px;
margin-top: 8px;
cursor: pointer;
}
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
}
</style>
......