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 @@ ...@@ -83,32 +83,19 @@
83 </el-form-item> 83 </el-form-item>
84 </el-col> 84 </el-col>
85 <el-col :span="7"> 85 <el-col :span="7">
86 <el-form-item label="土地证号"> 86 <el-form-item label="坐落">
87 <el-input placeholder="请输入土地证号" v-model="querydzForm.bdcqzh" clearable>
88 </el-input>
89 </el-form-item>
90 </el-col>
91 <el-col :span="7">
92 <el-form-item label="土地坐落">
93 <el-input placeholder="请输入土地坐落" v-model="querydzForm.zl" clearable> 87 <el-input placeholder="请输入土地坐落" v-model="querydzForm.zl" clearable>
94 </el-input> 88 </el-input>
95 </el-form-item> 89 </el-form-item>
96 </el-col> 90 </el-col>
97 </el-row> 91 <el-col :span="10" class="btnColRight">
98 <el-row>
99 <el-col :span="6">
100 <el-form-item label="项目名称">
101 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
102 </el-form-item>
103 </el-col>
104
105 <el-col :span="18" class="btnColRight">
106 <el-form-item> 92 <el-form-item>
107 <el-button type="primary" @click="resetForm(true)">重置</el-button> 93 <el-button type="primary" @click="resetForm(true)">重置</el-button>
108 <el-button type="primary" @click="handleSearch">查询</el-button> 94 <el-button type="primary" @click="handleSearch">查询</el-button>
109 </el-form-item> 95 </el-form-item>
110 </el-col> 96 </el-col>
111 </el-row> 97 </el-row>
98
112 </el-form> 99 </el-form>
113 </div> 100 </div>
114 <div class="from-clues-content loadingtext"> 101 <div class="from-clues-content loadingtext">
......
...@@ -38,7 +38,6 @@ class data extends filter { ...@@ -38,7 +38,6 @@ class data extends filter {
38 render: (h, scope) => { 38 render: (h, scope) => {
39 return ( 39 return (
40 <div> 40 <div>
41 {/*<a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>*/}
42 <span v-show={scope.row.qqzt == 1}>已确权</span> 41 <span v-show={scope.row.qqzt == 1}>已确权</span>
43 <span v-show={scope.row.qqzt == 0}>未确权</span> 42 <span v-show={scope.row.qqzt == 0}>未确权</span>
44 </div> 43 </div>
...@@ -47,10 +46,11 @@ class data extends filter { ...@@ -47,10 +46,11 @@ class data extends filter {
47 }, 46 },
48 { 47 {
49 prop: "tdzh", 48 prop: "tdzh",
49 width: '150',
50 label: "土地证号", 50 label: "土地证号",
51 }, 51 },
52 { 52 {
53 width: '100', 53 width: '120',
54 label: "权利类型", 54 label: "权利类型",
55 render: (h, scope) => { 55 render: (h, scope) => {
56 return ( 56 return (
...@@ -135,13 +135,12 @@ class data extends filter { ...@@ -135,13 +135,12 @@ class data extends filter {
135 }, 135 },
136 { 136 {
137 label: '操作', 137 label: '操作',
138 width: '160', 138 width: '120',
139 align: 'center', 139 align: 'center',
140 render: (h, scope) => { 140 render: (h, scope) => {
141 return ( 141 return (
142 <div> 142 <div>
143 <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button> 143 <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
144 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
145 </div> 144 </div>
146 ) 145 )
147 } 146 }
...@@ -191,24 +190,18 @@ class data extends filter { ...@@ -191,24 +190,18 @@ class data extends filter {
191 }, 190 },
192 { 191 {
193 prop: "tdzh", 192 prop: "tdzh",
193 width: '150',
194 label: "土地证号", 194 label: "土地证号",
195 }, 195 },
196 { 196 {
197 prop: "qllxmc", 197 prop: "qllxmc",
198 width: '120',
198 label: "权利类型", 199 label: "权利类型",
199 }, 200 },
200 { 201 {
201 prop: "xmmc", 202 prop: "xmmc",
202 label: "项目名称", 203 label: "项目名称",
203 }, 204 },
204 // {
205 // prop: "zrzh",
206 // label: "自然幢号",
207 // },
208 // {
209 // prop: "jzwmc",
210 // label: "建筑物名称",
211 // },
212 { 205 {
213 label: "土地/房屋性质", 206 label: "土地/房屋性质",
214 render: (h, scope) => { 207 render: (h, scope) => {
...@@ -220,7 +213,7 @@ class data extends filter { ...@@ -220,7 +213,7 @@ class data extends filter {
220 } 213 }
221 }, 214 },
222 { 215 {
223 label: "面积", 216 label: "土地/房屋面积",
224 render: (h, scope) => { 217 render: (h, scope) => {
225 return ( 218 return (
226 <div> 219 <div>
...@@ -239,29 +232,19 @@ class data extends filter { ...@@ -239,29 +232,19 @@ class data extends filter {
239 ) 232 )
240 } 233 }
241 }, 234 },
242 // {
243 // prop: "zcs",
244 // label: "总层数",
245 // width: '70',
246 // },
247 // {
248 // prop: "zts",
249 // label: "总套数",
250 // width: '70',
251 // },
252 { 235 {
253 prop: "zl", 236 prop: "zl",
254 label: "多幢坐落", 237 label: "多幢坐落",
255 }, 238 },
256 { 239 {
257 label: '操作', 240 label: '操作',
258 width: '80', 241 width: '120',
259 align: 'center', 242 align: 'center',
260 fixed: 'right', 243 fixed: 'right',
261 render: (h, scope) => { 244 render: (h, scope) => {
262 return ( 245 return (
263 <div> 246 <div>
264 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button> 247 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>自然幢</el-button>
265 </div> 248 </div>
266 ) 249 )
267 } 250 }
......