c2fa6f5f by weimo934

Merge remote-tracking branch 'origin/master'

2 parents fae459c2 776157fc
import request from '@/plugin/axios'
/**
* 查询逻辑幢基本信息
*/
export function getQjLjzDetailById(data) {
return request({
url: '/system/qjLjz/getQjLjzDetailById',
method: 'get',
params: {
id: data,
}
})
}
/**
* 更新保存逻辑幢基本信息
*/
export function updateQjLjz(data) {
return request({
url: '/system/qjLjz/updateQjLjz',
method: 'put',
data: data,
})
}
......@@ -417,7 +417,6 @@
//todo 权利人页面调整
this.formData.addQjDlrFrRequest=[];
this.formData.glbsm=this.bsm;
this.formData.gyfsbsm=this.gyfs;
//将代理人,法人数据合在一起,名称为addQjDlrFrRequest;
//法人的type字段类型为0,
this.formData.fr.type=0;
......@@ -427,7 +426,6 @@
this.formData.dlrList[k].type=1;
this.formData.addQjDlrFrRequest.push(this.formData.dlrList[k]);
}
this.formData.gyfsbsm=this.gyfs;
//如果是从更新按钮点击确定的则进行更新操作,如果不是,则进行添加操作
if(this.update){
console.log(this.formData)
......@@ -563,19 +561,12 @@
},
created(){
this.gyfsList = this.$store.state.gyfsList;
if(this.tableData.length>1){
for(let i = 0;i<this.gyfsList.length;i++){
let item = this.gyfsList[i];
this.gyfsList.disabled = item.mc === "单独所有" && item.bsm === this.gyfs;
}
}
},
mounted() {
this.getQlrInfo();
if(this.$store.state.gyfsList.length>0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}
},
watch:{
dialogVisible(n){
......@@ -632,6 +623,11 @@
this.gyfsList[i].disabled = item.mc === "单独所有";
}
}
console.log(this.tableData.length+":this.tableData[0].length");
if(this.tableData.length>1){
console.log(JSON.stringify(this.tableData[0])+":this.tableData[0].length");
this.gyfs = this.tableData[0].gyfsbsm
}
},
}
};
......
......@@ -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">
......@@ -10,22 +10,22 @@
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="4" >
<input class="formInput" maxlength="19" v-model="form.zddm">
<input class="formInput" :disabled="disabled" maxlength="19" v-model="form.zddm">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" maxlength="28" v-model="form.bdcdyh">
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
<input class="formInput percent80" :disabled="disabled" maxlength="28" v-model="form.bdcdyh">
<el-button @click.prevent="generatorCode" :disabled="disabled" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >项目名称</td>
<td colspan="4" >
<input class="formInput" v-model="form.xmmc">
<input class="formInput" :disabled="disabled" v-model="form.xmmc">
</td>
<td colspan="2" align="center" >房屋性质</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
<el-select class="formSelect" :disabled="disabled" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -39,13 +39,14 @@
<tr height="30">
<td colspan="2" align="center" >共有土地面积(㎡)</td>
<td colspan="4" >
<input class="formInput" type="number" v-model="form.zdmj">
<input class="formInput" :disabled="disabled" type="number" v-model="form.zdmj">
</td>
<td colspan="2" align="center" >竣工日期</td>
<td colspan="4" >
<el-date-picker
style="width:100%"
v-model="form.jgrq"
:disabled="disabled"
type="date"
placeholder="选择日期">
</el-date-picker>
......@@ -55,11 +56,11 @@
<tr height="30">
<td colspan="2" align="center" >分摊土地面积(㎡)</td>
<td colspan="4" >
<input class="formInput" type="number" v-model="form.fttdsymj">
<input class="formInput" type="number" :disabled="disabled" v-model="form.fttdsymj">
</td>
<td colspan="2" align="center" >产别</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
<el-select class="formSelect" :disabled="disabled" v-model="form.fwcbbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -73,11 +74,11 @@
<tr height="30">
<td colspan="2" align="center" >多幢独用土地面积(㎡)</td>
<td colspan="4" >
<input class="formInput" type="number" v-model="form.dlsytdmj">
<input class="formInput" :disabled="disabled" type="number" v-model="form.dlsytdmj">
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
<el-select class="formSelect" :disabled="disabled" v-model="form.fwcqlybsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -106,7 +107,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="form.qszt!='0'"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -122,7 +123,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="form.qszt!='0'"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -144,7 +145,7 @@
<span>坐落</span>
</td>
<td colspan="10" >
<input class="formInput" v-model="form.zl">
<input class="formInput" v-model="form.zl" :disabled="disabled">
</td>
</tr>
......@@ -153,7 +154,7 @@
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
<input class="formInput" v-model="form.bz" type="textarea">
<input class="formInput" v-model="form.bz" :disabled="disabled" type="textarea">
</td>
</tr>
<tr height="30">
......@@ -164,7 +165,7 @@
<span>调查意见</span>
</td>
<td colspan="10" >
<input class="formInput" v-model="form.name">
<input class="formInput" v-model="form.name" :disabled="disabled">
</td>
</tr>
......@@ -173,7 +174,7 @@
<span>审查员</span>
</td>
<td colspan="2" >
<input class="formInput" v-model="form.name">
<input class="formInput" v-model="form.name" :disabled="disabled">
</td>
<td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px">
<span>审查日期</span>
......@@ -182,6 +183,7 @@
<el-date-picker style="width:100%"
v-model="form.date"
type="date"
:disabled="disabled"
placeholder="选择日期">
</el-date-picker>
</td>
......@@ -189,8 +191,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 +283,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={
......@@ -366,6 +389,11 @@
getDzDetailByBsm(data).then((res)=>{
if(res.code===200) {
this.form = res.result;
if(this.form.bblx === 0 && this.form.qszt === 0 && this.form.bhqkbsm == null){
this.disabled = false
}else {
this.disabled = true
}
console.log(this.form+"fwytList")
console.log(this.form)
if(this.form.fwytList.length===0){
......@@ -480,21 +508,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 +538,7 @@
box-sizing: border-box;
padding: 18px;
padding-bottom: 0;
margin-bottom: 50px;
.iconfont{
cursor: pointer;
}
......@@ -578,5 +592,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" @click="loading">
<fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
......@@ -47,4 +47,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>
......
......@@ -315,7 +315,7 @@
export default {
name: "",
inject: ['getTreeByS'],
inject: ['getTreeByS','getRightTree'],
components: {zdQueryData,dzQueryData,hfghb},
props: {},
data() {
......@@ -634,6 +634,7 @@
}
saveDzFg(this.dzFghData).then(res => {
if (res.success) {
this.getRightTree(res.result,'0,1,2');
Message.success("保存成功")
//TO DO 多幢分割完成后的操作
} else {
......
......@@ -377,17 +377,17 @@ export default {
switch (row.dylx) {
case "zrz":
this.$store.state.zrzbsm = res.result;
this.getTreeByBsm(row.glbsm,row.dylx,'2');
this.getTreeByBsm(res.result,row.dylx,'2');
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = res.result;
this.getRightTree(row.glbsm,'2');
this.getRightTree(res.result,'2');
path = "/zd";
break;
case "dz":
this.$store.state.dzbsm = res.result;
this.getTreeByBsm(row.glbsm,row.dylx,'2');
this.getTreeByBsm(res.result,row.dylx,'2');
path = "/dz";
break;
default:
......
......@@ -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>
......@@ -22,7 +10,7 @@
<td colspan="2" class="tdright">行政区</td>
<td colspan="2">
<el-select
:disabled="formData.qszt!='0'"
:disabled="disabled"
class="formSelect"
v-model="formData.xzqbsm"
@change="changeXzq(formData.xzqbsm)"
......@@ -40,7 +28,7 @@
<td colspan="2">
<el-select
class="formSelect"
:disabled="formData.qszt!='0'"
:disabled="disabled"
v-model="formData.djqbsm"
@change="changeDjq(formData.djqbsm)"
>
......@@ -55,7 +43,7 @@
</td>
<td colspan="2" class="tdright">地籍子区</td>
<td colspan="2">
<el-select class="formSelect" @change="changeDjzq" :disabled="formData.qszt!='0'" v-model="formData.djzqbsm">
<el-select class="formSelect" @change="changeDjzq" :disabled="disabled" v-model="formData.djzqbsm">
<el-option
v-for="item in $store.state.djzqList"
:key="item.bsm"
......@@ -69,7 +57,7 @@
<tr>
<td colspan="2" class="tdright">权利类型</td>
<td colspan="4">
<el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.qllxbsm">
<el-select class="formSelect" :disabled="disabled" v-model="formData.qllxbsm">
<el-option
v-for="item in $store.state.qllxList"
:key="item.bsm"
......@@ -81,7 +69,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>宗地特征码</td>
<td colspan="4">
<el-select class="formSelect" ref="zdtzm" :disabled="formData.qszt!='0'"
<el-select class="formSelect" ref="zdtzm" :disabled="disabled"
v-model="formData.zdtzmbsm">
<el-option
v-for="item in $store.state.zdtzmList"
......@@ -96,7 +84,7 @@
<tr>
<td colspan="2" class="tdright">权利设定方式</td>
<td colspan="4">
<el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.qlsdfs">
<el-select class="formSelect" :disabled="disabled" v-model="formData.qlsdfs">
<el-option
v-for="item in $store.state.qlsdfsList"
:key="item.bsm"
......@@ -108,12 +96,12 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>宗地代码</td>
<td colspan="4" class="psr">
<input :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zddm" on maxlength="19"
<input :disabled="disabled" @blur="inputBlur($event)" ref="zddm" on maxlength="19"
type="text"
class="formInput percent80"
v-model="formData.zddm"
/>
<el-button type="warning" :disabled="formData.qszt!='0'" class="createBtn"
<el-button type="warning" :disabled="disabled" class="createBtn"
@click="generatorCode"
>生成
</el-button>
......@@ -122,29 +110,29 @@
<tr>
<td colspan="2" class="tdright">地籍号</td>
<td colspan="4">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.djh"/>
<input type="text" :disabled="disabled" class="formInput" v-model="formData.djh"/>
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
<td colspan="4" class="psr">
<input
type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="bdcdyh"
type="text" :disabled="disabled" @blur="inputBlur($event)" ref="bdcdyh"
maxlength="28"
class="formInput"
v-model="formData.bdcdyh"
/>
<!-- <el-button type="warning" :disabled="formData.qszt!='0'" class="createBtn">生成</el-button> -->
<!-- <el-button type="warning" :disabled="disabled" class="createBtn">生成</el-button> -->
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
<td colspan="4">
<input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zl"
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
class="formInput" v-model="formData.zl"/>
</td>
<td colspan="2" class="tdright">项目名称</td>
<td colspan="4" class="psr">
<input :disabled="formData.qszt!='0'"
<input :disabled="disabled"
type="text"
class="formInput "
v-model="formData.xmmc"
......@@ -154,7 +142,7 @@
<tr>
<td colspan="2" class="tdright">国民经济行业分类</td>
<td colspan="4">
<!-- <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm">-->
<!-- <el-select class="formSelect" :disabled="disabled" v-model="formData.gmjjhyflbsm">-->
<!-- <el-option-->
<!-- v-for="item in $store.state.gmjjhyflbsmList"-->
<!-- :key="item.bsm"-->
......@@ -169,7 +157,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="formData.qszt!='0'"
:disabled="disabled"
:data="$store.state.gmjjhyflbsmList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -179,13 +167,13 @@
</td>
<td colspan="2" class="tdright">价格(元)</td>
<td colspan="4" class="psr">
<input :disabled="formData.qszt!='0'" class="formInput" type="number" v-model="formData.jg"/>
<input :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">容积率</td>
<td colspan="2">
<el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyrjl">
<el-select class="formSelect" :disabled="disabled" v-model="formData.jyrjl">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -197,27 +185,27 @@
</td>
<td colspan="2">
<input
type="text" :disabled="formData.qszt!='0'"
type="text" :disabled="disabled"
v-model="rjl"
v-show="isInterval(formData.jyrjl)"
class="formInput percent47"
/>
<span class="percent4" v-show="isInterval(formData.jyrjl)">-</span>
<input
type="text" :disabled="formData.qszt!='0'"
type="text" :disabled="disabled"
v-model="formData.rjl"
:class="isInterval(formData.jyrjl) ? 'formInput percent47' : 'formInput'"
/>
</td>
<td colspan="2" class="tdright">容积说明</td>
<td colspan="4" class="psr">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjlsm"/>
<input type="text" :disabled="disabled" class="formInput" v-model="formData.rjlsm"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">建筑密度</td>
<td colspan="2">
<el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyjzmd">
<el-select class="formSelect" :disabled="disabled" v-model="formData.jyjzmd">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -230,26 +218,26 @@
<td colspan="2">
<input
type="text"
v-model="jzmd" :disabled="formData.qszt!='0'"
v-model="jzmd" :disabled="disabled"
v-show="isInterval(formData.jyjzmd)"
class="formInput percent47"
/>
<span class="percent4" v-show="isInterval(formData.jyjzmd)">-</span>
<input
type="text"
v-model="formData.jzmd" :disabled="formData.qszt!='0'"
v-model="formData.jzmd" :disabled="disabled"
:class="isInterval(formData.jyjzmd) ? 'formInput percent47' : 'formInput'"
/>
</td>
<td colspan="2" class="tdright">建筑密度说明</td>
<td colspan="4" class="psr">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzmdsm"/>
<input type="text" :disabled="disabled" class="formInput" v-model="formData.jzmdsm"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">建筑限高</td>
<td colspan="2">
<el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.jyjzxg">
<el-select class="formSelect" :disabled="disabled" v-model="formData.jyjzxg">
<el-option
v-for="item in compareList"
:key="item.value"
......@@ -261,34 +249,34 @@
</td>
<td colspan="2">
<input
type="text" :disabled="formData.qszt!='0'"
type="text" :disabled="disabled"
v-model="jzxg"
v-show="isInterval(formData.jyjzxg)"
class="formInput percent47"
/>
<span class="percent4" v-show="isInterval(formData.jyjzxg)">-</span>
<input
type="text" :disabled="formData.qszt!='0'"
type="text" :disabled="disabled"
v-model="formData.jzxg"
:class="isInterval(formData.jyjzxg) ? 'formInput percent47' : 'formInput'"
/>
</td>
<td colspan="2" class="tdright">建筑限高说明</td>
<td colspan="4" class="psr">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzxgsm"/>
<input type="text" :disabled="disabled" class="formInput" v-model="formData.jzxgsm"/>
</td>
</tr>
<tr>
<td colspan="2" rowspan="2" class="tdright">所在图幅号</td>
<td colspan="2" class="tdright">比例尺</td>
<td colspan="8" class="psr">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.blc"/>
<input type="text" :disabled="disabled" class="formInput" v-model="formData.blc"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">图幅号</td>
<td colspan="8" class="psr">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.tfh"/>
<input type="text" :disabled="disabled" class="formInput" v-model="formData.tfh"/>
</td>
</tr>
......@@ -296,28 +284,28 @@
<td colspan="2" rowspan="4" class="tdright">宗地四至</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="formData.qszt!='0'"
<input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="disabled"
class="formInput" v-model="formData.zdszb"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>东至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="formData.qszt!='0'"
<input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="disabled"
class="formInput" v-model="formData.zdszd"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>南至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="formData.qszt!='0'"
<input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="disabled"
class="formInput" v-model="formData.zdszn"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>西至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="formData.qszt!='0'"
<input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="disabled"
class="formInput" v-model="formData.zdszx"/>
</td>
</tr>
......@@ -329,55 +317,46 @@
<tr>
<td colspan="2" class="tdright">批准面积(㎡)</td>
<td colspan="4" >
<input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
<input type="text" :disabled="disabled" onkeyup="value=value.replace(/[^\d\.]/g,'')"
class="formInput" v-model="formData.pzmj"/>
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>宗地面积(㎡)</td>
<td colspan="4" >
<input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zdmj"
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zdmj"
onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">建筑占地总面积(㎡)</td>
<td colspan="4">
<input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
<input type="text" :disabled="disabled" onkeyup="value=value.replace(/[^\d\.]/g,'')"
class="formInput" v-model="formData.jzzdzmj"/>
</td>
<td colspan="2" class="tdright">建筑总面积(㎡)</td>
<td colspan="4">
<input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
<input type="text" :disabled="disabled" onkeyup="value=value.replace(/[^\d\.]/g,'')"
class="formInput" v-model="formData.jzzmj"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">共有/共用权利人情况</td>
<td colspan="10">
<input type="text" :disabled="formData.qszt!='0'" class="formInput"
<input type="text" :disabled="disabled" class="formInput"
v-model="formData.gygyqlrqk"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright" rowspan="2">说明</td>
<td colspan="10" rowspan="2">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.sm"/>
<input type="text" :disabled="disabled" class="formInput" v-model="formData.sm"/>
</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>
......@@ -519,6 +498,11 @@
.then((res) => {
if (res.result) {
this.formData = res.result;
if(this.formData.bblx === 0 && this.formData.qszt === 0 && this.formData.bhqkbsm == null){
this.disabled = false
}else {
this.disabled = true
}
console.log(res.result, 'res.result');
this.getXzqData(res.result.xzqbsm, res.result.djqbsm);
//如果没有宗地代码,自动生成
......
......@@ -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">
......@@ -600,8 +600,10 @@
if(res.code===200){
this.form = res.result;
this.hbsm = res.result.bsm;
if(res.result.qszt !== '0'){
this.disableFlag = true;
if(this.form.bblx === 0 && this.form.qszt === 0 && this.form.bhqkbsm == null){
this.disableFlag = false
}else {
this.disableFlag = true
}
if(this.form.scyclx==='0'){
this.$set(this.form,"ycjzmj", this.form.jzmj)
......
......@@ -109,15 +109,18 @@
<span @click="deleteYtInfo(index)">删除</span>
</td>
<td colspan="9">
<el-select v-model="item1.fwytzdbsm" placeholder="请选择">
<el-option
v-for="item in $store.state.tdytList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
>
</el-option>
</el-select>
<el-select-tree style="width:100%"
ref="yt"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
</tr>
......@@ -145,15 +148,18 @@
<span @click="deleteFwjgInfo(index)">删除</span>
</td>
<td colspan="9">
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择">
<el-option
v-for="item in $store.state.jgOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
>
</el-option>
</el-select>
<el-select-tree style="width:100%"
ref="yt"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:data="$store.state.jgOptions"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="item1.fwjgzdbsm"
></el-select-tree>
</td>
</tr>
......@@ -192,6 +198,7 @@
<script>
import { insertLjzInfo } from "@api/lpb";
import { getQjLjzDetailById,updateQjLjz } from "@api/ljz";
import { formdate } from "@libs/function";
export default {
name: "ljz",
......@@ -204,6 +211,21 @@ export default {
},
data() {
return {
//树型结构
show:true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
disabled: false,
checkStrictly: true,
treeProps: {
value: 'bsm',
children: 'children',
label: 'mc'
},
form: {
zrzbsm: "",
ljzh: "", //逻辑幢号
......@@ -336,6 +358,11 @@ export default {
}else{
//逻辑幢更新接口调用 TODO
console.log('保存');
updateQjLjz(this.form).then((res)=>{
if(res.code === 200){
this.$message.success("修改成功")
}
})
}
},
onSubmit() {
......@@ -343,8 +370,48 @@ export default {
},
//根据逻辑幢bsm查询逻辑幢信息
getLjzInfo(bsm){
//逻辑幢信息查询接口调用 bsm为逻辑幢bsm TODO
this.form = {zrzh:'11111111'};
//逻辑幢信息查询接口调用 bsm为逻辑幢bsm
getQjLjzDetailById(bsm).then((res)=>{
if(res.code === 200){
this.form = res.result;
this.form.zrzh = this.$store.state.zrzh;
this.form.fwjgList= [
{
fwjgzdbsm: "", //房屋结构字典标识码
glbsm: "", //关联标识码
sx: "", //顺序
},
];
this.form.ytList= [
{
glbsm: "", //关联标识码
fwytzdbsm: "", //房屋用途字典标识码
sx: "", //顺序
},
];
if(this.form.qjfwjg.length>0){
this.form.fwjgList= [];
for(let i =0;i<this.form.qjfwjg.length;i++){
this.form.fwjgList.push({
fwjgzdbsm: this.form.qjfwjg[i].fwjgzdbsm, //房屋结构字典标识码
glbsm: this.form.qjfwjg[i].glbsm, //关联标识码
sx: this.form.qjfwjg[i].sx, //顺序
})
}
}
if(this.form.qjfwyt.length>0){
this.form.ytList= [];
for(let i =0;i<this.form.qjfwyt.length;i++){
this.form.ytList.push({
fwytzdbsm: this.form.qjfwyt[i].fwytzdbsm, //房屋结构字典标识码
glbsm: this.form.qjfwyt[i].glbsm, //关联标识码
sx: this.form.qjfwyt[i].sx, //顺序
})
}
}
console.log(JSON.stringify(this.form)+":this.form")
}
})
this.$forceUpdate();
}
},
......
......@@ -10,40 +10,40 @@
<td colspan="2" class="tdright">宗地代码</td>
<td colspan="4" style="min-width:450px">
<input v-model="form.zddm" class="formInput" disabled>
<input v-show="false" :disabled="form.qszt!='0'" maxlength="19" class="formInput" v-model="form.zdbsm">
<input v-show="false" :disabled="disabled" maxlength="19" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" :disabled="form.qszt!='0'" class="createBtn" size="mini">生成</el-button>
<input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>项目名称</td>
<td colspan="4" >
<input class="formInput " ref="xmmc" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.xmmc">
<input class="formInput " ref="xmmc" @blur="inputBlur($event)" :disabled="disabled" v-model="form.xmmc">
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
<td colspan="4">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="disabled" maxlength="28" v-model="form.bdcdyh">
</td>
</tr>
<tr>
<td colspan="2" class="tdright">建筑物名称</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwmc">
<input class="formInput" :disabled="disabled" v-model="form.jzwmc">
</td>
<td colspan="2" class="tdright">建筑物基本用途</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwjbyt">
<input class="formInput" :disabled="disabled" v-model="form.jzwjbyt">
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>房屋性质</td>
<td colspan="4" >
<el-select class="formSelect" ref="fwxz" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" >
<el-select class="formSelect" ref="fwxz" :disabled="disabled" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -56,7 +56,7 @@
<td colspan="4" >
<el-date-picker
style="width:100%"
:disabled="form.qszt!='0'"
:disabled="disabled"
v-model="form.jgrq"
type="date"
placeholder="选择日期">
......@@ -66,55 +66,55 @@
<tr>
<td colspan="2" class="tdright">地下层数</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.dxcs">
<input class="formInput" :disabled="disabled" type="number" v-model="form.dxcs">
</td>
<td colspan="2" class="tdright">地上层数</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.dscs">
<input class="formInput" :disabled="disabled" type="number" v-model="form.dscs">
</td>
</tr>
<tr>
<td colspan="2" class="tdright">总层数</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.zcs">
<input class="formInput" :disabled="disabled" type="number" v-model="form.zcs">
</td>
<td colspan="2" class="tdright">总套数</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.zts">
<input class="formInput" :disabled="disabled" type="number" v-model="form.zts">
</td>
</tr>
<tr>
<td colspan="2" class="tdright">建筑物高度(m)</td>
<td colspan="4" >
<input class="formInput" type="number" :disabled="form.qszt!='0'" v-model="form.jzwgd">
<input class="formInput" type="number" :disabled="disabled" v-model="form.jzwgd">
</td>
<td colspan="2" class="tdright">地下深度(m)</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.dxsd">
<input class="formInput" :disabled="disabled" type="number" v-model="form.dxsd">
</td>
</tr>
<tr>
<td colspan="2" class="tdright">幢用地面积(㎡)</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.zydmj">
<input class="formInput" :disabled="disabled" type="number" v-model="form.zydmj">
</td>
<td colspan="2" class="tdright">幢占用地面积(㎡)</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.zzdmj">
<input class="formInput" :disabled="disabled" type="number" v-model="form.zzdmj">
</td>
</tr>
<tr>
<td colspan="2" class="tdright">预测建筑面积(㎡)</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.ycjzmj">
<input class="formInput" :disabled="disabled" type="number" v-model="form.ycjzmj">
</td>
<td colspan="2" class="tdright">实测建筑面积(㎡)</td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" type="number" v-model="form.scjzmj">
<input class="formInput" :disabled="disabled" type="number" v-model="form.scjzmj">
</td>
</tr>
......@@ -123,7 +123,7 @@
<tr>
<td colspan="2" class="tdright">产别</td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" >
<el-select v-model="form.fwcbbsm" :disabled="disabled" placeholder="请选择" >
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -134,7 +134,7 @@
</td>
<td colspan="2" class="tdright">产权来源</td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" >
<el-select v-model="form.fwcqlybsm" :disabled="disabled" placeholder="请选择" >
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -163,7 +163,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="form.qszt!='0'"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -179,7 +179,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="form.qszt!='0'"
:disabled="disabled"
:data="$store.state.fwytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -200,7 +200,7 @@
</td>
<td colspan="9" >
<el-select class="persent78" ref="fwjg" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-select class="persent78" ref="fwjg" :disabled="disabled" v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.jgOptions"
:key="item.bsm"
......@@ -222,7 +222,7 @@
<span><i class="requisite">*</i>坐落</span>
</td>
<td colspan="10" >
<input class="formInput" ref="zl" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.zl">
<input class="formInput" ref="zl" @blur="inputBlur($event)" :disabled="disabled" v-model="form.zl">
</td>
</tr>
......@@ -231,7 +231,7 @@
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.bz" type="textarea">
<input class="formInput" :disabled="disabled" v-model="form.bz" type="textarea">
</td>
</tr>
<tr>
......@@ -242,7 +242,7 @@
<span>调查意见</span>
</td>
<td colspan="10" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.dcyj">
<input class="formInput" :disabled="disabled" v-model="form.dcyj">
</td>
</tr>
......@@ -251,14 +251,14 @@
<span>审查员</span>
</td>
<td colspan="2" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.scy">
<input class="formInput" :disabled="disabled" v-model="form.scy">
</td>
<td colspan="2" class="tdright">
<span>审查日期</span>
</td>
<td colspan="2" >
<el-date-picker
:disabled="form.qszt!='0'"
:disabled="disabled"
v-model="form.date"
type="date"
style="width: 100%"
......@@ -663,6 +663,11 @@
// if(res.result.zddm == null){
// this.generatorCode()
// }
if(this.form.bblx === 0 && this.form.qszt === 0 && this.form.bhqkbsm == null){
this.disabled = false
}else {
this.disabled = true
}
this.$store.state.zrzh = res.result.zrzh;
if(this.form.fwjgList.length===0){
this.form.fwjgList.push({
......