Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3c7f49a2 by renchao@pashanhoo.com
Options

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

2 parents 419fabdc db7459c7
Inline Side-by-side
Showing 2 changed files with 14 additions and 5 deletions
...@@ -104,7 +104,11 @@ ...@@ -104,7 +104,11 @@
104 </el-table-column> 104 </el-table-column>
105 <el-table-column 105 <el-table-column
106 property="syqmj" 106 property="syqmj"
107 label="使用权面积"> 107 label="面积">
108 </el-table-column>
109 <el-table-column
110 property="qlytmc"
111 label="用途">
108 </el-table-column> 112 </el-table-column>
109 <el-table-column 113 <el-table-column
110 property="zl" 114 property="zl"
...@@ -283,8 +287,8 @@ ...@@ -283,8 +287,8 @@
283 */ 287 */
284 handleRowClick (row) { 288 handleRowClick (row) {
285 this.queryForm.bhqkbsm = row.bhqkbsm 289 this.queryForm.bhqkbsm = row.bhqkbsm
286 this.radioVal = row.bdcdyh 290 //this.radioVal = row.bdcdyh
287 row.bglx = '1' 291 //row.bglx = '1'
288 selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => { 292 selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
289 this.$endLoading(); 293 this.$endLoading();
290 if (res.code === 200) { 294 if (res.code === 200) {
......
...@@ -81,7 +81,7 @@ class data extends filter { ...@@ -81,7 +81,7 @@ class data extends filter {
81 }, 81 },
82 { 82 {
83 prop: "qlmjmc", 83 prop: "qlmjmc",
84 width: '100', 84 width: 100,
85 label: "使用权面积", 85 label: "使用权面积",
86 }, 86 },
87 { 87 {
...@@ -198,7 +198,12 @@ class datatwo extends filter { ...@@ -198,7 +198,12 @@ class datatwo extends filter {
198 { 198 {
199 prop: "qlmjmc", 199 prop: "qlmjmc",
200 width: 100, 200 width: 100,
201 label: "使用权面积", 201 label: "面积",
202 },
203 {
204 prop: "qlytmc",
205 width: 100,
206 label: "用途",
202 }, 207 },
203 { 208 {
204 prop: "zl", 209 prop: "zl",
......