Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c2fa6f5f by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents fae459c2 776157fc
Expand all
Inline Side-by-side
Showing 11 changed files with 157 additions and 47 deletions
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="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:
......
......@@ -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();
}
},
......