Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5e61439b by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/panel/change/fwsxbg/index.vue
2 parents 867c6bbc 2dd00fd9
Inline Side-by-side
Showing 7 changed files with 292 additions and 201 deletions
......@@ -57,6 +57,7 @@ table,td,tr,.el-col,.title{
}
input:disabled{
cursor: not-allowed;
background-color: #F5F7FA;
}
.formInput:focus{
border: 1px solid #A0C5F6!important;
......@@ -148,16 +149,22 @@ ol, ul { list-style:none; }
font-size: 12px;
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
}
.contextmenu li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
}
.contextmenu li:hover {
background: #eee;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
}
li:hover {
background: #eee;
}
.noEdit{
color: #E6E6E6;
cursor: not-allowed;
}
.noEdit:hover{
background: #ffffff;
}
}
// end
//生成按钮样式
......
......@@ -132,6 +132,7 @@
<li>
<input
type="text"
style="top: -1px;"
:disabled="formData.qszt!='0'"
placeholder="请输入"
v-model="childItem.pzytdm"
......@@ -422,6 +423,8 @@ export default {
input {
position: relative;
top: -2px;
height: 35px;
width: calc(100% - 1px) !important;
}
.el-input__inner {
height: 34px;
......
......@@ -5,20 +5,25 @@
v-for="(items, index) in countList"
:key="items.id"
>
<template v-for="(childItem,childIndex) in items.list" >
<el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''">
<template v-for="(childItem, childIndex) in items.list">
<el-col
:span="2"
class="btnCol"
:key="childIndex + '1'"
:class="childIndex > 0 ? 'childYT noTopBorder' : ''"
>
<el-button
v-show="childIndex<1"
v-show="childIndex < 1"
type="primary"
class="changeBtn"
@click="handleClick( index, 'add')"
class="changeBtn addMinus outAdd"
@click="handleClick(index, 'add')"
>+</el-button
>
<el-button
v-show="childIndex<1"
v-show="childIndex < 1"
type="primary"
class="changeBtn"
@click="handleClick( index, 'minus')"
class="changeBtn addMinus outMinus"
@click="handleClick(index, 'minus')"
>-</el-button
>
<div
......@@ -26,58 +31,71 @@
v-if="items.isInside"
></div>
</el-col>
<el-col :span="2" class="btnCol" :key="childIndex+'8'" :class="childIndex>0 ? 'childYT':''">
<el-col
:span="2"
class="btnCol"
:key="childIndex + '8'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<!-- <template v-if="childIndex>0"> -->
<span class="qlxz" v-show="childIndex<1">权利性质</span><br>
<el-button
type="primary"
class="changeBtn"
@click="handleInClick(index, childIndex, 'add')"
>+</el-button
>
<el-button
type="primary"
class="changeBtn"
@click="handleInClick(index, childIndex, 'minus')"
>-</el-button
>
<!-- </template> -->
<span class="qlxz" v-show="childIndex < 1">权利性质</span><br />
<el-button
type="primary"
class="changeBtn addMinus inAdd"
@click="handleInClick(index, childIndex, 'add')"
>+</el-button
>
<el-button
type="primary"
class="changeBtn addMinus inMinus"
@click="handleInClick(index, childIndex, 'minus')"
>-</el-button
>
<!-- </template> -->
</el-col>
<el-col :span="5" :key="childIndex+'7'" :class="childIndex>0 ? 'childYT':''">
<el-col
:span="5"
:key="childIndex + '7'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>批准用途</li>
<li>实际用途</li>
<li>土地使用起始时间<i class="requisite">*</i></li>
</ul>
</el-col>
<el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
<el-col
:span="5"
:key="childIndex + '6'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.pzytdm"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.pzytdm"
></el-select-tree>
</li>
<li>
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.sjytdm"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
:clearable="clearable"
v-model="childItem.sjytdm"
></el-select-tree>
</li>
<li>
......@@ -91,34 +109,53 @@
</li>
</ul>
</el-col>
<el-col :span="5" :key="childIndex+'5'" :class="childIndex>0 ? 'childYT':''">
<el-col
:span="5"
:key="childIndex + '5'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>地类编码</li>
<li>地类编码</li>
<li>土地使用结束时间<i class="requisite">*</i></li>
</ul>
</el-col>
<el-col :span="5" :key="childIndex+'4'" :class="childIndex>0 ? 'childYT':''">
<el-col
:span="5"
:key="childIndex + '4'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>
<input type="text" placeholder="请输入" v-model="childItem.pzytdm" class="formInput" />
<input
type="text"
style="top: -1px;"
placeholder="请输入"
v-model="childItem.pzytdm"
class="formInput"
/>
</li>
<li>
<input type="text" placeholder="请输入" v-model="childItem.sjytdm" class="formInput" />
<input
type="text"
placeholder="请输入"
v-model="childItem.sjytdm"
class="formInput"
/>
</li>
<li>
<el-date-picker
v-model="childItem.tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
v-model="childItem.tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
</el-date-picker>
</li>
</ul>
</el-col>
</template>
<div class="title">
<el-select class="formSelect" v-model="items.qlxzdm">
<el-option
......@@ -146,17 +183,17 @@ export default {
data() {
return {
//树型结构
show:true,
show: true,
clearable: true,
defaultExpandAll: true,
multiple: false,
placeholder: '请选择',
placeholder: "请选择",
disabled: false,
checkStrictly: true,
treeProps: {
value: 'dm',
children: 'children',
label: 'mc'
value: "dm",
children: "children",
label: "mc",
},
countList: [
......@@ -164,97 +201,96 @@ export default {
id: Math.random(),
isInside: false,
hasNotBorder: false,
"bsm": "",//权利性质标识码
"glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
"qlxzdm": "",
"zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
list:[
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
list: [
{
"pzdjbsm": "",
"pzdjmc": "",
"pzytdm": "",
"pzytmc": "",
"pzytmj": 0,
"qlxzbsm": "",
"sjdjbsm": "",
"sjdjmc": "",
"sjytdm": "",
"sjytmc": "",
"sjytmj": 0,
"syqx": "",
"tdsyjssj": "",
"tdsyqssj": "",
"tdzh": ""
}
]
pzdjbsm: "",
pzdjmc: "",
pzytdm: "",
pzytmc: "",
pzytmj: 0,
qlxzbsm: "",
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
sjytmc: "",
sjytmj: 0,
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
tdzh: "",
},
],
},
],
outNum:0
outNum: 0,
};
},
created(){
},
created() {},
methods: {
//外层操作
handleClick( ind, type) {
handleClick(ind, type) {
let outsideObj = {
id: Math.random(),
isInside: false,
hasNotBorder: false,
"bsm": "",//权利性质标识码
"glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
"qlxzdm": "",
"zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
list:[
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
list: [
{
"pzdjbsm": "",
"pzdjmc": "",
"pzytdm": "",
"pzytmc": "",
"pzytmj": 0,
"qlxzbsm": "",
"sjdjbsm": "",
"sjdjmc": "",
"sjytdm": "",
"sjytmc": "",
"sjytmj": 0,
"syqx": "",
"tdsyjssj": "",
"tdsyqssj": "",
"tdzh": ""
}
]
pzdjbsm: "",
pzdjmc: "",
pzytdm: "",
pzytmc: "",
pzytmj: 0,
qlxzbsm: "",
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
sjytmc: "",
sjytmj: 0,
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
tdzh: "",
},
],
};
if (type === "add") {
this.countList.push(outsideObj);
this.outNum++
this.outNum++;
} else {
this.countList.forEach((item, index) => {
if (index == ind && this.countList.length > 1) {
this.countList.splice(index, 1);
}
});
this.outNum--
this.outNum--;
}
},
//内层操作
handleInClick(index, childIndex, type) {
let insideObj = {
"pzdjbsm": "",
"pzdjmc": "",
"pzytdm": "",
"pzytmc": "",
"pzytmj": 0,
"qlxzbsm": "",
"sjdjbsm": "",
"sjdjmc": "",
"sjytdm": "",
"sjytmc": "",
"sjytmj": 0,
"syqx": "",
"tdsyjssj": "",
"tdsyqssj": "",
"tdzh": ""
pzdjbsm: "",
pzdjmc: "",
pzytdm: "",
pzytmc: "",
pzytmj: 0,
qlxzbsm: "",
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
sjytmc: "",
sjytmj: 0,
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
tdzh: "",
};
if (type === "add") {
this.countList[index].list.splice(childIndex + 1, 0, insideObj);
......@@ -273,7 +309,8 @@ export default {
if (index == this.countList.length - 1) {
item.hasNotBorder = true;
} else {
item.hasNotBorder = item.isInside && !this.countList[index + 1].isInside ? true : false;
item.hasNotBorder =
item.isInside && !this.countList[index + 1].isInside ? true : false;
}
});
},
......@@ -289,7 +326,7 @@ export default {
.qlxzModule {
height: auto;
position: relative;
border-bottom: 1px solid #E6E6E6;
border-bottom: 1px solid #e6e6e6;
.el-col {
// height: 100%;
border-right: 1px solid grey;
......@@ -303,16 +340,22 @@ export default {
height: 37px;
line-height: 37px;
text-decoration: none;
border-bottom: 1px solid #E6E6E6;
.el-select{
border-bottom: 1px solid #e6e6e6;
.el-select {
width: 100%;
}
.el-input{
.el-input {
width: 100%;
}
.el-input__inner {
height: 34px;
}
input {
position: relative;
top: -2px;
height: 35px;
width: calc(100% - 1px) !important;
}
}
li:last-child {
border-bottom: none;
......@@ -330,12 +373,12 @@ export default {
bottom: 2px;
}
}
.childYT{
.childYT {
height: 114px;
border-top: 1px solid grey;
ul {
margin-top: 0;
li{
li {
.el-input__inner {
height: 29px;
}
......@@ -348,10 +391,10 @@ export default {
margin-top: 4px;
}
}
.noTopBorder{
.noTopBorder {
border-top: 0;
}
.noRightBorder{
.noRightBorder {
border-right: 0;
}
.el-col:nth-last-child(2) {
......@@ -397,5 +440,11 @@ export default {
.el-row:nth-last-child(1) {
border-bottom: none;
}
/deep/.el-select-tree {
width: 100%;
.el-input__inner {
height: 30px !important;
}
}
}
</style>
......
......@@ -62,7 +62,8 @@
<li v-show="isZD">导入属性</li>
<li v-show="!isZD">导入楼盘</li>
<li>重叠分析</li>
<li v-show="isZD" @click="openCreateDialog">添加定着物</li>
<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
<li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
<li @click="deleteByBsm()">删除</li>
</ul>
<ul
......@@ -131,7 +132,9 @@ export default {
//控制新建宗地菜单
createVisible:false,
//多幢
dzVisible:false
dzVisible:false,
//宗地权属状态
zdQszt:null,
};
},
watch: {
......@@ -175,7 +178,8 @@ export default {
this.visible = data;
},
changeZdData(data) {
this.zdData = data
this.zdData = data;
this.zdQszt = data.qszt;
},
changeTop(data) {
this.top = data;
......
......@@ -121,55 +121,59 @@ export default {
},
//点击办理
handleClick(row) {
console.log("fwsxbg");
console.log(row);
var params = { bsm: row.glbsm, type: row.dylx };
fwsxbgbl(params)
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.message,
type: "success",
});
var newGlbsm=res.result;
let path = "";
switch (row.dylx) {
case "zrz":
this.$store.state.zrzbsm = newGlbsm;
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = newGlbsm;
path = "/zd";
break;
case "dz":
this.$store.state.dzbsm = newGlbsm;
path = "/dz";
break;
default:
break;
}
this.$router.push({
path: path,
query: {
bsm: newGlbsm,
source: 2
let params = { bsm: row.glbsm, type: row.dylx };
this.$confirm('是否确定范围属性变更?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
fwsxbgbl(params)
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.message,
type: "变更成功",
});
let path = "";
switch (row.dylx) {
case "zrz":
this.$store.state.zrzbsm = res.result;
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = res.result;
path = "/zd";
break;
case "dz":
this.$store.state.dzbsm = res.result;
path = "/dz";
break;
default:
break;
}
});
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
this.$router.push({
path: path,
query: {
bsm: newGlbsm,
source: 2
}
});
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
.catch((error) => {
this.$message({
message: res.message,
type: "error",
});
});
}).catch(() => {
});
},
},
......
......@@ -215,12 +215,23 @@
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
<el-button
type="primary"
style="margin-right: 10px"
class="changeBtn addMinus inAdd"
@click="addYtInfo"
>+</el-button
>
<span>用途<i class="requisite">*</i></span>
</td>
<td width="30" colspan="1" align="center" >
<el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
<el-button
type="primary"
class="changeBtn addMinus inMinus"
@click="deleteYtInfo(index)"
>-</el-button
>
规划用途
</td>
<td width="30" colspan="4" align="center" >
......@@ -256,7 +267,14 @@
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
<!-- <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> -->
<el-button
type="primary"
style="margin-right: 10px"
class="changeBtn addMinus inAdd"
@click="addFwjgInfo"
>+</el-button
>
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="1" align="center" >
......@@ -808,7 +826,6 @@
td{
//bgcolor:#F1F4FC;
bgcolor:#fff;
width:8.33%
}
......@@ -824,4 +841,11 @@
.hTable{
margin-top: 10px;
}
/deep/.el-select-tree{
width: 100%;
.el-input__inner{
height: 30px !important;
}
}
</style>
\ No newline at end of file
......
......@@ -13,19 +13,19 @@
<input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" >自然幢号<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh">
<td colspan="4" class="psr">
<input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
<tr>
<td colspan="2" >项目名称<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc">
<input class="formInput " :disabled="form.qszt!='0'" v-model="form.xmmc">
</td>
<td colspan="2" >不动产单元号<i class="requisite">*</i></td>
<td colspan="4" class="psr">
<input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.bdcdyh">
<el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
<td colspan="4">
<input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh">
</td>
</tr>
......@@ -150,7 +150,7 @@
</td>
<td colspan="1" style="min-width:120px">
<el-button type="info" class="outMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
<el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
规划用途
</td>
<td colspan="3" >
......@@ -190,7 +190,7 @@
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="1" >
<el-button type="primary" class="outMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
<el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
</td>
<td colspan="9" >
......@@ -272,7 +272,7 @@
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit} from "../../../api/common"
......