1091b4a8 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 065f0cec 69fab0fe
......@@ -242,4 +242,10 @@ ol, ul { list-style:none; }
}
.creat:hover:focus{
opacity: .8!important;
}
.iconfontEdit{
cursor: pointer;
}
.iconfontEdit:hover{
color: rgb(0, 108, 255);
}
\ No newline at end of file
......
......@@ -177,6 +177,9 @@ export default {
"$store.state.zdbsm": function(bsm) {
this.getRightTree(bsm);
},
"$store.state.zrzbsm": function(bsm) {
this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
},
"$store.state.treeData":function (val) {
console.log(val,'val');
......@@ -430,6 +433,8 @@ export default {
width: 100%;
height: 100vh;
position: relative;
min-width: 1500px;
overflow-x: auto;
.calcWidth{
width: calc(100% - 300px);
}
......
......@@ -9,15 +9,6 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
......@@ -37,7 +28,17 @@
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="办理" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit"></i>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div class="pagination">
......@@ -61,7 +62,7 @@
return {
total: 0,
pageNo: 1,
pageSize: 10,
pageSize: 15,
qszt: ['1', '2'],
queryData: {},
formData: {
......
......@@ -64,13 +64,6 @@
<td class="zl">坐落</td>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="xzzrz(scope.row)" type="text" size="small"
>选择
</el-button>
</template>
</el-table-column>
<el-table-column prop="zddm" align="left" label="宗地代码">
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
......@@ -82,6 +75,16 @@
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="选择" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="xzzrz(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<!-- <el-button @click="xzzrz(scope.row)" type="text" size="small"
>选择
</el-button> -->
</template>
</el-table-column>
</el-table>
</div>
<span slot="footer" class="dialog-footer"> </span>
......
......@@ -9,14 +9,6 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button>
<el-button type="text" size="small">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
......@@ -41,7 +33,21 @@
{{ scope.row.addtime | timeFilter }}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="办理" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit"></i>
</el-tooltip>
<!-- <el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button>
<el-button type="text" size="small">定位</el-button> -->
</template>
</el-table-column>
</el-table>
<div class="pagination">
......@@ -72,7 +78,7 @@ export default {
qszt: ['2'],
total: 0,
pageNo: 1,
pageSize: 10,
pageSize: 15,
tableData: [],
tableHeight: "100",
queryData: {},
......@@ -80,7 +86,7 @@ export default {
},
created() {},
mounted() {
this.getData({});
this.getData({pageSize:this.pageSize});
// console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
this.$nextTick(() => {
this.tableHeight =
......
......@@ -98,11 +98,10 @@
</el-tab-pane>
<el-tab-pane class="eltabspane" label="自然幢" name="zrz">
<el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="demo-form-inline">
<el-form-item label="项目名称" prop="xmmc">
<el-form-item label="项目名称" class="w100" prop="xmmc">
<el-input
v-model="ruleForm1.xmmc"
placeholder="项目名称"
style="width:400px;"
></el-input>
</el-form-item>
</el-form>
......@@ -114,11 +113,10 @@
</el-tab-pane>
<el-tab-pane class="eltabspane" label="多幢" name="dz">
<el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="demo-form-inline">
<el-form-item label="项目名称" prop="xmmc">
<el-form-item label="项目名称" class="w100" prop="xmmc">
<el-input
v-model="ruleForm2.xmmc"
placeholder="项目名称"
style="width:400px;"
></el-input>
</el-form-item>
</el-form>
......@@ -243,9 +241,16 @@ export default {
methods: {
// 重置
reset(){
this.$refs['ruleForm'].resetFields();
this.$refs["ruleForm1"].resetFields();
this.$refs["ruleForm2"].resetFields();
debugger
if(this.$refs['ruleForm']){
this.$refs['ruleForm'].resetFields();
}
if(this.$refs["ruleForm1"]){
this.$refs["ruleForm1"].resetFields();
}
if (this.$refs["ruleForm2"]) {
this.$refs["ruleForm2"].resetFields();
}
},
handleClick(tab, event) {
console.log(tab, event);
......@@ -290,7 +295,6 @@ export default {
this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
insertZrzjbxx(this.ruleForm1)
.then((res) => {
debugger
if (res.code == "200") {
this.$message({
message: "创建成功!",
......@@ -300,13 +304,13 @@ export default {
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.zrzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.close();
this.$router.push({
path: '/zrz', query:{
source: 1,
bsm:res.result.bsm
}
});
this.close();
} else {
this.$message.error("创建失败!");
}
......@@ -334,13 +338,13 @@ export default {
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.dzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.close();
this.$router.push({
path: '/dz', query:{
source: 1,
bsm:res.result.bsm
}
});
this.close();
} else {
this.$message.error("创建失败!");
}
......@@ -405,8 +409,8 @@ export default {
}
},
close() {
this.$emit("closeDialog");
this.reset();
this.$emit("closeDialog");
},
},
computed: {},
......
......@@ -9,15 +9,6 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>更正
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
......@@ -37,7 +28,24 @@
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人"> -->
<!-- </el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="更正" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit"></i>
</el-tooltip>
</template>
<!-- <template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>更正
</el-button
>
<el-button type="text" size="small">定位</el-button>
</template> -->
</el-table-column>
</el-table>
<div class="pagination">
......@@ -63,7 +71,7 @@
qszt: ['1'],
total: 0,
pageNo: 1,
pageSize: 10,
pageSize: 15,
formData: {
user: "",
region: "",
......
......@@ -9,22 +9,13 @@
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small" @click="postionToMap(scope.row)">定位</el-button>
</template>
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
</el-table-column>
<el-table-column prop="bdcqzh" align="left" label="不动产权证号">
</el-table-column>
<el-table-column prop="dylx" align="left" width="120" label="类型">
<el-table-column prop="dylx" align="left" width="100" label="类型">
<template slot-scope="scope">
{{scope.row.dylx | bdcLxFilter}}
</template>
......@@ -37,7 +28,22 @@
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
<!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="办理" placement="top">
<i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
<el-tooltip class="item" effect="light" content="定位" placement="top">
<i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
</el-tooltip>
<!-- <el-button type="text" size="small"
>办理
</el-button
>
<el-button type="text" size="small">定位</el-button> -->
</template>
</el-table-column>
</el-table>
<div class="pagination">
......