Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
7a84d435 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents ff02ed10 5810b0e0
Inline Side-by-side
Showing 5 changed files with 76 additions and 51 deletions
......@@ -116,11 +116,11 @@
<td colspan="5">
<el-select class="selectTitle" v-model="form.fwjgbsm">
<el-option
v-for="i in $store.state.fwjgList"
:key="i.bsm"
:label="i.mc"
:value="i.bsm"
></el-option>
v-for="item in $store.state.jgOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
</tr>
......@@ -177,10 +177,10 @@
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwjgList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
v-for="item in $store.state.jgOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
......
<template>
<div class="dz content-form">
<div class="dz content-form" ref="mainBox">
<el-form ref="form" :model="form" label-width="160px">
<Qlr ref="qlrxxModule" :bsm="bsm"></Qlr>
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable">
......@@ -189,8 +189,8 @@
</tbody>
</table>
</el-form>
<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>
</div>
......@@ -281,8 +281,29 @@
}],
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
mainBoxWidth: 0,
}
},
created() {
if(this.source===1){
this.bsm=this.$route.query.bsm;
this.form.dzbsm=this.$route.query.bsm;
this.getZddm(this.$store.state.zdbsm);
}else {
this.bsm=this.$route.query.bsm;
this.form.dzbsm=this.$route.query.bsm;
}
if(this.source!==1){
this.bsm=this.$route.query.bsm;
this.form.dzbsm=this.$route.query.bsm;
this.getDzDetailByBsm(this.$route.query.bsm)
}
},
mounted(){
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
methods: {
registerCall(){
let data={
......@@ -480,21 +501,6 @@
})
},
},
created() {
if(this.source===1){
this.bsm=this.$route.query.bsm;
this.form.dzbsm=this.$route.query.bsm;
this.getZddm(this.$store.state.zdbsm);
}else {
this.bsm=this.$route.query.bsm;
this.form.dzbsm=this.$route.query.bsm;
}
if(this.source!==1){
this.bsm=this.$route.query.bsm;
this.form.dzbsm=this.$route.query.bsm;
this.getDzDetailByBsm(this.$route.query.bsm)
}
},
computed: {
dzbsm() {
return this.$route.query.bsm;
......@@ -525,6 +531,7 @@
box-sizing: border-box;
padding: 18px;
padding-bottom: 0;
margin-bottom: 50px;
.iconfont{
cursor: pointer;
}
......@@ -578,5 +585,26 @@
text-align: center;
}
}
.header-button {
z-index: 3;
height: 50px;
position: fixed;
bottom: 0;
right: 0;
text-align: center;
background-color: #ffffff;
.el-button {
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
}
</style>
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
</el-tabs>
......@@ -43,4 +43,22 @@
watch: {},
};
</script>
<style scoped lang="less"></style>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
background: #eaedf5;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -2,18 +2,6 @@
<div class="main" ref="mainBox">
<div class="formMenu">
<Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
<!-- <el-button
type="primary"
class="changeBtn"
@click="getQlrxxData"
>获取权利人信息数据</el-button
>
<el-button
type="primary"
class="changeBtn"
@click="getQlxzData"
>获取权利性质组件数据</el-button
> -->
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<th colspan="12">宗地基本信息</th>
......@@ -365,19 +353,10 @@
</td>
</tr>
</table>
<!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" class="saveBtn" @click="updateZDxx">保存</el-button>
<el-button type="primary" @click="submitZDxx">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div> -->
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="updateZDxx">保存</el-button>
<el-button type="primary" @click="submitZDxx">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
</div>
</div>
......
......@@ -284,7 +284,7 @@
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.fwjgList"
v-for="item in $store.state.jgOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
......