08543a78 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 90fd387b 8c030a19
.content_box {
padding: 18px;
padding-top: 0;
box-sizing: border-box;
}
.el-table .success-row {
......@@ -8,6 +9,10 @@
.main{
width: 100%;
height: 100%;
padding: 18px 18px 0!important;
}
.pagination {
padding: 18px;
}
.db{
display: block;
......
<template>
<div class="">重新落宗</div>
</template>
<script>
export default {
name:"",
components:{},
props:{},
data(){
return {
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<template>
<div class="">分割</div>
</template>
<script>
export default {
name:"",
components:{},
props:{},
data(){
return {
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<template>
<div class="main">
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
:height="tableHeight"
:row-class-name="tableRowClassName"
>
<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="项目名称">
</el-table-column>
<el-table-column prop="bdcqzh" align="left" label="不动产权证号">
</el-table-column>
<el-table-column prop="dylx" align="left" width="120" label="类型">
<template slot-scope="scope">
{{scope.row.dylx | bdcLxFilter}}
</template>
</el-table-column>
<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 prop="addtime" align="left" width="120" label="转入时间">
<template slot-scope="scope">
{{scope.row.addtime | timeFilter}}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next" :total="total"
:current-page="pageNo" @current-change="handleCurrentChange">
</el-pagination>
</div>
</div>
</div>
</template>
<script>
import SearchHead from "../../../../components/searchHead/searchHead";
import {getSearchList} from "../../../../api/search";
export default {
name: "",
components: {SearchHead},
props: {},
data() {
return {
total: 0,
pageNo: 1,
pageSize: 10,
tableData: [],
tableHeight: "",
queryData: {}
};
},
created() {
},
mounted() {
this.getData({})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
},
methods: {
onSubmit() {
},
tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 !== 0) {
return "even-row";
} else {
return "";
}
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.queryData.pageNo = val;
this.getData(this.queryData);
},
getData(data) {
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total = res.result.total
})
},
//获取子组件点击查询触发的事件
geQuerytData(obj) {
this.queryData = obj
//将obj作为参数调用接口查询表格数据
this.queryData['pageSize'] = this.pageSize
this.pageNo = 1
this.queryData['pageNo'] = 1
this.getData(this.queryData)
},
//点击办理
handleClick(row) {
let path = "";
switch (row.dylx) {
case "zrz":
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = row.glbsm;
path = "/zd";
break;
default:
break;
}
this.$router.push({
path: path,
query: {
bsm: row.glbsm,
source: 2
}
});
},
},
computed: {},
watch: {},
};
</script>
<style scoped lang="less">
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px!important;
display: flex;
flex-direction: column;
background-color: #fcfdff;
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
}
</style>
<template>
<div class="">合并</div>
</template>
<script>
export default {
name:"",
components:{},
props:{},
data(){
return {
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<template>
<div class=""></div>
<div class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg></fwsxbg></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import fg from "./fg";
import hb from "./hb";
import fwsxbg from "./fwsxbg";
import cxlz from "./cxlz";
export default {
name:"",
components:{},
props:{},
data(){
return {
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
name: "",
components: {
fg,hb,fwsxbg,cxlz
},
props: {},
data() {
return {
activeName: "fg",
};
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
},
},
created() {},
mounted() {},
computed: {},
watch: {},
};
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<style scoped lang="less"></style>
......
......@@ -95,26 +95,19 @@
</el-tab-pane>
<el-tab-pane class="eltabspane" label="宗海" name="zh">宗海</el-tab-pane>
<el-tab-pane class="eltabspane" label="自然幢" name="zrz">
<el-form :inline="true" class="zrzProject">
<el-form-item label="项目名称">
<el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject">
<el-form-item label="项目名称" prop="xmmc">
<el-input
v-model="zrzProjectName"
v-model="ruleForm1.xmmc"
placeholder="项目名称"
style="width:400px;"
></el-input>
</el-form-item>
<div>
<el-form-item style="margin-left:300px;">
<el-button type="primary">导入图形</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="newZrz">创建</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="close">取消</el-button>
</el-form-item>
</div>
<el-form-item class="handleBtn">
<el-button type="primary">导入图形</el-button>
<el-button type="primary" @click="newZrz">创建</el-button>
<el-button type="primary" @click="close">取消</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane class="eltabspane" label="多幢" name="dz">多幢</el-tab-pane>
......@@ -154,6 +147,11 @@ export default {
"xzqbsm": "",
"zdtzmbsm": ""
},
ruleForm1:{
zdbsm:'',
xmmc:'',
userbsm:''
},
rules: {
xzqbsm: [
{ required: true, message: '请选择行政区', trigger: 'change' }
......@@ -174,6 +172,11 @@ export default {
{ required: true, message: '请选择宗地特征码', trigger: 'change' }
]
},
rules1: {
xmmc: [
{ required: true, message: '请输入项目名称', trigger: 'blur' },
],
},
syqlx: [
{
label: "国家所有",
......@@ -227,35 +230,37 @@ export default {
},
newZrz() {
//todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
var data = {
userbsm: "",
xmmc: this.zrzProjectName,
zdbsm: "",
};
console.log(data);
insertZrzjbxx(data)
.then((res) => {
if (res.code == "200") {
this.$message({
message: "创建成功!",
type: "success",
});
//todo 跳转到自然幢基本信息内容表页面 (预留)
this.close();
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.zrzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.$router.push({
path: '/zrz', query:{
source: 1,
bsm:res.result.bsm
this.$refs['ruleForm1'].validate((valid) => {
if (valid) {
insertZrzjbxx(this.ruleForm1)
.then((res) => {
if (res.code == "200") {
this.$message({
message: "创建成功!",
type: "success",
});
//todo 跳转到自然幢基本信息内容表页面 (预留)
this.close();
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.zrzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.$router.push({
path: '/zrz', query:{
source: 1,
bsm:res.result.bsm
}
});
} else {
this.$message.error("创建失败!");
}
});
} else {
this.$message.error("创建失败!");
}
})
.catch((error) => {});
})
.catch((error) => {});
} else {
console.log('error submit!!');
return false;
}
});
},
getXzqList() {
getAllList()
......@@ -319,6 +324,9 @@ export default {
height: 100%;
width: 100%;
padding: 20px;
.el-form--inline .el-form-item__label{
width: 100px;
}
.el-form-item{
margin-bottom: 20px;
}
......@@ -340,7 +348,4 @@ export default {
.zrzProject {
margin-top: 80px;
}
.el-form--inline .el-form-item__label{
width: 100px;
}
</style>
......
......@@ -136,12 +136,12 @@
<td colspan="4">
<input type="text" class="formInput" v-model="formData.zl" />
</td>
<td colspan="2">土地权属来源证明材料</td>
<td colspan="2">项目名称</td>
<td colspan="4" class="psr">
<input
type="text"
class="formInput "
v-model="formData.tdqslyzmcl"
v-model="formData.xmmc"
/>
</td>
</tr>
......