4669efef by weimo934

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/zrz.js
2 parents cb4ca7ac 089ed639
import request from '@/plugin/axios'
/**
* 新增自然幢基本信息
*/
export function insertZrzjbxx(data) {
export function insertZrzjbxx (data) {
return request({
url: 'fw/qjZrz/insert',
method: 'post',
......@@ -14,13 +13,13 @@ export function insertZrzjbxx(data) {
/**
* 生成不动产单元号
*/
export function getBdcdyh(dpdm, dptype) {
export function getBdcdyh (dpdm,dptype) {
return request({
url: '/system/generator/getBdcdyh',
method: 'get',
params: {
dpdm: dpdm,
dptype: dptype
params:{
dpdm:dpdm,
dptype:dptype
}
})
}
......@@ -28,23 +27,23 @@ export function getBdcdyh(dpdm, dptype) {
/**
* 保存自然幢信息
*/
export function saveZrzInfo(data) {
export function saveZrzInfo (data) {
return request({
url: '/fw/qjZrz/updateQjZrz',
method: 'put',
data: data
data:data
})
}
/**
* 保存自然幢信息
*/
export function getZrzDetailByBsm(data) {
export function getZrzDetailByBsm (data) {
return request({
url: '/fw/qjZrz/getQjZrzDetailById',
method: 'get',
params: {
id: data
params:{
id:data
}
})
}
......@@ -70,4 +69,25 @@ export function queryYzgy(id) {
params: {id}
})
}
/**
* 新增逻辑幢信息接口
*/
export function insertLjzInfo (data) {
return request({
url: '/system/qjLjz/insertQjLjz',
method: 'post',
data:data
})
}
/**
* 新增逻辑幢信息接口
*/
export function insertCInfo (data) {
return request({
url: '/system/qjC/insertQjC',
method: 'post',
data:data
})
}
......
......@@ -123,7 +123,9 @@ export default {
},
//添加定着物
openCreateDialog(){
debugger
this.dialogVisible = true
this.$store.state.rightClickZdbsm = this.zdData.zdbsm;
},
//关闭添加定着物弹框
closeDialog() {
......
......@@ -83,6 +83,18 @@ const constantRoutes = [
code: "1-5",
component: () => import("@/views/systemZD/index"),
},
{
path: "/ljz",
name: "逻辑幢",
code: "1-6",
component: () => import("@/views/systemZRZ/ljz/index"),
},
{
path: "/c",
name: "层",
code: "1-7",
component: () => import("@/views/systemZRZ/c/index"),
},
],
},
];
......
......@@ -13,6 +13,7 @@ const store = new Vuex.Store({
xmmc: '', // 项目名称
zdmj: '', // 宗地面积
zdzl: '', // 宗地坐落
rightClickZdbsm:'', //右键菜单传入的zdbsm
tdytList:[],
tddjList:[],
qlxzList:[],
......@@ -33,6 +34,7 @@ const store = new Vuex.Store({
cqlyOptions:[],
jgOptions:[],
gmjjhyflbsmList:[],
fwytList:[],
//创建自然幢时需要用到的临时存储信息
zrzbsm: '',
zjlxList: [],
......
......@@ -210,6 +210,7 @@ export default {
s.gyfsList = s.gyfsList.length == 0 ?await this.getDicData("共有方式") : s.gyfsList;
s.qlxzList = s.qlxzList.length == 0 ?await this.getDicData("权利性质") : s.qlxzList;
s.tdytList = s.tdytList.length == 0 ?await this.getDicData("土地用途") : s.tdytList;
s.fwytList = s.fwytList.length == 0 ?await this.getDicData("房屋用途") : s.fwytList;
s.tddjList = s.tddjList.length == 0 ?await this.getDicData("土地等级") : s.tddjList;
s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions;
......
......@@ -250,6 +250,7 @@ export default {
//todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
this.$refs['ruleForm1'].validate((valid) => {
if (valid) {
this.ruleForm1.zdbsm = this.$store.state.rightClickZdbsm != '' ? this.$store.state.rightClickZdbsm : '';
insertZrzjbxx(this.ruleForm1)
.then((res) => {
if (res.code == "200") {
......
<template>
<div class="h content-form">
<el-form ref="form" :model="form" label-width="160px">
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
<tbody>
<tr height="30">
<td colspan="12" align="center" ><font size="4">逻辑幢基本信息</font></td>
</tr>
<tr height="30">
<td colspan="2" align="center" >层号</td>
<td colspan="4" >
<el-input v-model="form.ch"></el-input>
</td>
<td colspan="2" align="center" >自然幢号</td>
<td colspan="4" >
<el-input v-model="form.zrzh"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >实际层</td>
<td colspan="4" >
<el-input v-model="form.sjc"></el-input>
</td>
<td colspan="2" align="center" >名义层</td>
<td colspan="4" >
<el-input v-model="form.myc"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >层建筑面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.cjzmj"></el-input>
</td>
<td colspan="2" align="center" >层套内建筑面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.ctnjzmj"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >层阳台面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.cytmj"></el-input>
</td>
<td colspan="2" align="center" >层半墙面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.cbqmj"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >层共有建筑面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.cgyjzmj"></el-input>
</td>
<td colspan="2" align="center" >层分摊建筑面积(㎡)</td>
<td colspan="4" >
<el-input v-model="form.cftjzmj"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >层高</td>
<td colspan="4" >
<el-input v-model="form.cg"></el-input>
</td>
<td colspan="2" align="center" >水平投影面积</td>
<td colspan="4" >
<el-input v-model="form.sptymj"></el-input>
</td>
</tr>
<tr height="30">
</tr>
</tbody>
</table>
</el-form>
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
</div>
</div>
</template>
<script>
import {insertCInfo} from "../../../api/zrz";
export default {
name:'c',
components:{},
data () {
return {
form:{
zrzbsm:'',
ch:'', //层号
zrzh:'', //自然幢号
sjc:'', //实际层
myc:'', //名义层
cjzmj:'', //层建筑面积
ctnjzmj:'', //层套内建筑面积
cytmj:'', //层阳台面积
cbqmj:'', //层半墙面积
cgyjzmj:'', //层共有建筑面积
cftjzmj:'', //层分摊建筑面积
cg:'', //层高
sptymj:'', //水平投影面积
},
value: '',
}
},
methods: {
onSave(){
this.form.zrzbsm=this.$router.query.bsm;
insertCInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存成功")
}
})
console.log(this.form)
},
onSubmit(){
console.log(this.form)
}
}
}
</script>
<style rel="stylesheet/less" lang="less" scoped>
.h {
min-height: 200px;
width: 80%;
margin-top: 10px;
margin-left: 10%;
float: left;
/deep/.el-input__inner{
width: 100%;
border: 0;
}
/deep/textarea{
width: 100%;
border: 0;
}
.el-form-item{
font-weight: bold;
font-size: xx-large
}
table{
background: #fff;
table-layout: fixed;
}
td{
//bgcolor:#F1F4FC;
bgcolor:#fff;
width:8.33%
}
.el-select{
display:block;
}
}
table{
font-size: 14px;
}
.hTable{
margin-top: 10px;
}
</style>
\ No newline at end of file