fcc0ecbc by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents a3e80054 81400844
......@@ -83,32 +83,19 @@
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="土地证号">
<el-input placeholder="请输入土地证号" v-model="querydzForm.bdcqzh" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="土地坐落">
<el-form-item label="坐落">
<el-input placeholder="请输入土地坐落" v-model="querydzForm.zl" clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="项目名称">
<el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="18" class="btnColRight">
<el-col :span="10" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="resetForm(true)">重置</el-button>
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="from-clues-content loadingtext">
......
......@@ -38,7 +38,6 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
{/*<a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>*/}
<span v-show={scope.row.qqzt == 1}>已确权</span>
<span v-show={scope.row.qqzt == 0}>未确权</span>
</div>
......@@ -47,10 +46,11 @@ class data extends filter {
},
{
prop: "tdzh",
width: '150',
label: "土地证号",
},
{
width: '100',
width: '120',
label: "权利类型",
render: (h, scope) => {
return (
......@@ -135,13 +135,12 @@ class data extends filter {
},
{
label: '操作',
width: '160',
width: '120',
align: 'center',
render: (h, scope) => {
return (
<div>
<el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
</div>
)
}
......@@ -191,24 +190,18 @@ class data extends filter {
},
{
prop: "tdzh",
width: '150',
label: "土地证号",
},
{
prop: "qllxmc",
width: '120',
label: "权利类型",
},
{
prop: "xmmc",
label: "项目名称",
},
// {
// prop: "zrzh",
// label: "自然幢号",
// },
// {
// prop: "jzwmc",
// label: "建筑物名称",
// },
{
label: "土地/房屋性质",
render: (h, scope) => {
......@@ -220,7 +213,7 @@ class data extends filter {
}
},
{
label: "面积",
label: "土地/房屋面积",
render: (h, scope) => {
return (
<div>
......@@ -239,29 +232,19 @@ class data extends filter {
)
}
},
// {
// prop: "zcs",
// label: "总层数",
// width: '70',
// },
// {
// prop: "zts",
// label: "总套数",
// width: '70',
// },
{
prop: "zl",
label: "多幢坐落",
},
{
label: '操作',
width: '80',
width: '120',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>自然幢</el-button>
</div>
)
}
......