Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
07b87cf8 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents fc5c8870 46c6dc4d
Inline Side-by-side
Showing 7 changed files with 397 additions and 154 deletions
1 <template> 1 <template>
2 <div class="main"> 2 <div>
3 <el-dialog 3 <el-dialog
4 title="选择宗地" 4 title="选择宗地"
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
......
...@@ -90,6 +90,7 @@ service.interceptors.response.use( ...@@ -90,6 +90,7 @@ service.interceptors.response.use(
90 }, 90 },
91 error => { 91 error => {
92 if (error && error.response) { 92 if (error && error.response) {
93 loadingInstance.close();
93 switch (error.response.status) { 94 switch (error.response.status) {
94 case 400: 95 case 400:
95 error.message = '请求错误'; 96 error.message = '请求错误';
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="search"> 3 <div class="search">
4 <el-button type="primary" @click="search">查询</el-button> 4 <!-- <el-row :gutter="10" class="shop">
5 <el-button type="primary" @click="result">重置</el-button> 5 <el-col :span="8" class="inputtitle">
6 <el-row :gutter="10" class="shop"> 6 <span>宗地编码</span>
7 <el-col :span="4" class="inputtitle">
8 宗地编码:
9 </el-col>
10 <el-col :span="8" class="">
11 <el-input v-model="queryData.zddm"></el-input> 7 <el-input v-model="queryData.zddm"></el-input>
12 </el-col> 8 </el-col>
13 <el-col :span="4" class="inputtitle"> 9 <el-col :span="8" class="inputtitle">
14 不动产权证号: 10 <span>不动产权证号</span>
15 </el-col>
16 <el-col :span="8" class="">
17 <el-input v-model="queryData.bdcqzh"></el-input> 11 <el-input v-model="queryData.bdcqzh"></el-input>
18 </el-col> 12 </el-col>
19 </el-row> 13 <el-col :span="8" class="inputtitle">
20 <el-row :gutter="10"> 14 <span>不动产权单元号</span>
21 <el-col :span="4" class="inputtitle">
22 不动产权单元号:
23 </el-col>
24 <el-col :span="8">
25 <el-input v-model="queryData.bdcdyh"></el-input> 15 <el-input v-model="queryData.bdcdyh"></el-input>
26 </el-col> 16 </el-col>
17 </el-row>
18 <el-row :gutter="10">
27 <el-col :span="4" class="inputtitle"> 19 <el-col :span="4" class="inputtitle">
28 权利人: 20 权利人:
29 </el-col> 21 </el-col>
...@@ -38,8 +30,114 @@ ...@@ -38,8 +30,114 @@
38 <el-col :span="8"> 30 <el-col :span="8">
39 <el-input v-model="queryData.zl"></el-input> 31 <el-input v-model="queryData.zl"></el-input>
40 </el-col> 32 </el-col>
33 </el-row> -->
34 <el-row>
35 <el-col :span="24">
36 <el-form :inline="true" class="demo-form-inline">
37 <el-form-item label="宗地编码">
38 <el-input
39 v-model="queryData.zddm"
40 placeholder="输入宗地编码"
41 @change="query"
42 ></el-input>
43 </el-form-item>
44 <el-form-item label="不动产权证号">
45 <el-input
46 v-model="queryData.bdcqzh"
47 placeholder="输入坐落地址"
48 @change="query"
49 ></el-input>
50 </el-form-item>
51 <el-form-item label="不动产单元号">
52 <el-input
53 v-model="queryData.bdcdyh"
54 placeholder="输入不动产单元号"
55 @change="query"
56 ></el-input>
57 </el-form-item>
58 <el-form-item label="权利人">
59 <el-input
60 v-model="queryData.qlrmc"
61 placeholder="输入权利人姓名"
62 @change="query"
63 ></el-input>
64 </el-form-item>
65 <el-form-item label="坐落">
66 <el-input
67 v-model="queryData.zl"
68 placeholder="输入坐落地址"
69 @change="query"
70 ></el-input>
71 </el-form-item>
72
73 <!-- <el-button
74 type="primary"
75 class="moreSearchBtn"
76 @click="moreSearch"
77 >高级查询
78 </el-button> -->
79 <!-- @click="ismore = !ismore" -->
80 </el-form>
81 </el-col>
82 </el-row>
83 <el-row>
84 <el-col :span="24">
85 <el-form :inline="true" :model="queryData" class="demo-form-inline">
86 <el-form-item class="demo-form-inline" label="查询范围">
87 <el-checkbox-group v-model="queryData.dylxs" @change="query">
88 <el-checkbox label="zd" name="type">宗地</el-checkbox>
89 <el-checkbox label="dz" name="type">多幢</el-checkbox>
90 <el-checkbox label="zrz" name="type">自然幢</el-checkbox>
91 <el-checkbox label="h" name="type">户</el-checkbox>
92 <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
93 <el-checkbox label="lq" name="type">林权</el-checkbox>
94 <el-checkbox label="zh" name="type">宗海</el-checkbox>
95 </el-checkbox-group>
96 </el-form-item>
97
98 <el-button type="primary" @click="query">查询</el-button>
99 <el-button type="warning" @click="reset">重置</el-button>
100 </el-form>
101 </el-col>
102 <el-col :span="2">
103 </el-col>
41 </el-row> 104 </el-row>
42 <table border="1"> 105
106 <el-table
107 :data="Data"
108 :height="tableHeight"
109 :row-class-name="tableRowClassName"
110 >
111 <td class="xh">序号</td>
112 <td class="cz">操作</td>
113 <td class="zddm">宗地代码</td>
114 <td class="bdcdyh">不动产单元号</td>
115 <td class="xmmc">项目名称</td>
116 <td class="bdcqzh">不动产权证号</td>
117 <td class="qlr">权利人</td>
118 <td class="zl">坐落</td>
119 <el-table-column type="index" width="80" align="center" label="序号">
120 </el-table-column>
121 <el-table-column label="操作" width="100">
122 <template slot-scope="scope">
123 <el-button @click="xzzrz(scope.row)" type="text" size="small"
124 >选择
125 </el-button>
126 </template>
127 </el-table-column>
128 <el-table-column prop="zddm" align="left" label="宗地代码">
129 </el-table-column>
130 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
131 </el-table-column>
132 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
133 </el-table-column>
134 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
135 </el-table-column>
136 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
137 </el-table-column>
138 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
139 </el-table>
140 <!-- <table border="1">
43 <tr> 141 <tr>
44 <td class="xh">序号</td> 142 <td class="xh">序号</td>
45 <td class="cz">操作</td> 143 <td class="cz">操作</td>
...@@ -67,7 +165,7 @@ ...@@ -67,7 +165,7 @@
67 <td class="qlr" :title="item.qlr">{{ item.qlr }}</td> 165 <td class="qlr" :title="item.qlr">{{ item.qlr }}</td>
68 <td class="zl">{{ item.zl }}</td> 166 <td class="zl">{{ item.zl }}</td>
69 </tr> 167 </tr>
70 </table> 168 </table> -->
71 </div> 169 </div>
72 <span slot="footer" class="dialog-footer"> </span> 170 <span slot="footer" class="dialog-footer"> </span>
73 <cxlz-query-data 171 <cxlz-query-data
...@@ -116,12 +214,22 @@ ...@@ -116,12 +214,22 @@
116 }, 214 },
117 Data: [], 215 Data: [],
118 dylxs: ["zd"], 216 dylxs: ["zd"],
217 tableHeight:0
119 }; 218 };
120 }, 219 },
121 created() { 220 created() {
122 }, 221 },
123 mounted() { 222 mounted() {
124 this.getData(this.queryData); 223 this.getData(this.queryData);
224 if ((document.documentElement.clientWidth || document.body.clientWidth) < 1890) {
225 this.$nextTick(()=>{
226 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 355;
227 })
228 }else{
229 this.$nextTick(()=>{
230 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 304;
231 })
232 }
125 }, 233 },
126 methods: { 234 methods: {
127 currentChange: function (val) { 235 currentChange: function (val) {
...@@ -170,7 +278,6 @@ ...@@ -170,7 +278,6 @@
170 box-sizing: border-box; 278 box-sizing: border-box;
171 padding: 18px; 279 padding: 18px;
172 height: auto; 280 height: auto;
173 width: 80%;
174 } 281 }
175 282
176 table { 283 table {
...@@ -199,6 +306,14 @@ ...@@ -199,6 +306,14 @@
199 306
200 .inputtitle { 307 .inputtitle {
201 line-height: 40px; 308 line-height: 40px;
309 span{
310 display: inline-block;
311 width: 120px;
312 text-align: left;
313 }
314 /deep/ .el-input{
315 width: calc(100% - 120px);
316 }
202 } 317 }
203 318
204 .shop { 319 .shop {
...@@ -250,4 +365,10 @@ ...@@ -250,4 +365,10 @@
250 width: auto; 365 width: auto;
251 height: auto; 366 height: auto;
252 } 367 }
368 /deep/ .el-form-item__label{
369 width: 96px;
370 }
371 /deep/ .el-form{
372 margin-left: -28px;
373 }
253 </style> 374 </style>
......
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
8 <span class="tips">分割前宗地信息</span> 8 <span class="tips">分割前宗地信息</span>
9 <table border="1"> 9 <table border="1">
10 <tr> 10 <tr>
11 <td>序号</td> 11 <th>序号</th>
12 <td>宗地代码</td> 12 <th>宗地代码</th>
13 <td>不动产单元号</td> 13 <th>不动产单元号</th>
14 <td>项目名称</td> 14 <th>项目名称</th>
15 <td>不动产权证号</td> 15 <th>不动产权证号</th>
16 <td>权利人</td> 16 <th>权利人</th>
17 <td>坐落</td> 17 <th>坐落</th>
18 </tr> 18 </tr>
19 <tr v-if="Object.keys(bgqData)==0"> 19 <tr v-if="Object.keys(bgqData)==0">
20 <td colspan="7"> 20 <td colspan="7">
...@@ -41,14 +41,14 @@ ...@@ -41,14 +41,14 @@
41 <span class="tips">分割后宗地信息</span> 41 <span class="tips">分割后宗地信息</span>
42 <table border="1"> 42 <table border="1">
43 <tr> 43 <tr>
44 <td>操作</td> 44 <th>操作</th>
45 <td>行政区</td> 45 <th>行政区</th>
46 <td>地籍区</td> 46 <th>地籍区</th>
47 <td>地籍子区</td> 47 <th>地籍子区</th>
48 <td>所有权类型</td> 48 <th>所有权类型</th>
49 <td>土地特征码</td> 49 <th>土地特征码</th>
50 <td>项目名称</td> 50 <th>项目名称</th>
51 <td>幢信息</td> 51 <th>幢信息</th>
52 </tr> 52 </tr>
53 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 53 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
54 <td @click="delRow(index)">-</td> 54 <td @click="delRow(index)">-</td>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
167 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" 167 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
168 @close="close"></query-data> 168 @close="close"></query-data>
169 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 169 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
170 <el-button type="primary" @click="save">保存</el-button> 170 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
171 </div> 171 </div>
172 </div> 172 </div>
173 </el-tab-pane> 173 </el-tab-pane>
...@@ -178,13 +178,13 @@ ...@@ -178,13 +178,13 @@
178 <span class="tips">分割前宗地信息</span> 178 <span class="tips">分割前宗地信息</span>
179 <table border="1"> 179 <table border="1">
180 <tr> 180 <tr>
181 <td>序号</td> 181 <th>序号</th>
182 <td>宗地代码</td> 182 <th>宗地代码</th>
183 <td>不动产单元号</td> 183 <th>不动产单元号</th>
184 <td>项目名称</td> 184 <th>项目名称</th>
185 <td>不动产权证号</td> 185 <th>不动产权证号</th>
186 <td>权利人</td> 186 <th>权利人</th>
187 <td>坐落</td> 187 <th>坐落</th>
188 </tr> 188 </tr>
189 <tr v-if="Object.keys(bgqData)==0"> 189 <tr v-if="Object.keys(bgqData)==0">
190 <td colspan="7"> 190 <td colspan="7">
...@@ -211,14 +211,14 @@ ...@@ -211,14 +211,14 @@
211 <span class="tips">分割后宗地信息</span> 211 <span class="tips">分割后宗地信息</span>
212 <table border="1"> 212 <table border="1">
213 <tr> 213 <tr>
214 <td>操作</td> 214 <th>操作</th>
215 <td>行政区</td> 215 <th>行政区</th>
216 <td>地籍区</td> 216 <th>地籍区</th>
217 <td>地籍子区</td> 217 <th>地籍子区</th>
218 <td>所有权类型</td> 218 <th>所有权类型</th>
219 <td>土地特征码</td> 219 <th>土地特征码</th>
220 <td>项目名称</td> 220 <th>项目名称</th>
221 <td>幢信息</td> 221 <th>幢信息</th>
222 </tr> 222 </tr>
223 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 223 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
224 <td @click="delRow(index)">-</td> 224 <td @click="delRow(index)">-</td>
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
336 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" 336 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
337 @close="close"></query-data> 337 @close="close"></query-data>
338 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 338 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
339 <el-button type="primary" @click="save">保存</el-button> 339 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
340 </div> 340 </div>
341 </div> 341 </div>
342 </el-tab-pane> 342 </el-tab-pane>
...@@ -347,13 +347,13 @@ ...@@ -347,13 +347,13 @@
347 <span class="tips">分割前宗地信息</span> 347 <span class="tips">分割前宗地信息</span>
348 <table border="1"> 348 <table border="1">
349 <tr> 349 <tr>
350 <td>序号</td> 350 <th>序号</th>
351 <td>宗地代码</td> 351 <th>宗地代码</th>
352 <td>不动产单元号</td> 352 <th>不动产单元号</th>
353 <td>项目名称</td> 353 <th>项目名称</th>
354 <td>不动产权证号</td> 354 <th>不动产权证号</th>
355 <td>权利人</td> 355 <th>权利人</th>
356 <td>坐落</td> 356 <th>坐落</th>
357 </tr> 357 </tr>
358 <tr v-if="Object.keys(bgqData)==0"> 358 <tr v-if="Object.keys(bgqData)==0">
359 <td colspan="7"> 359 <td colspan="7">
...@@ -380,14 +380,14 @@ ...@@ -380,14 +380,14 @@
380 <span class="tips">分割后宗地信息</span> 380 <span class="tips">分割后宗地信息</span>
381 <table border="1"> 381 <table border="1">
382 <tr> 382 <tr>
383 <td>操作</td> 383 <th>操作</th>
384 <td>行政区</td> 384 <th>行政区</th>
385 <td>地籍区</td> 385 <th>地籍区</th>
386 <td>地籍子区</td> 386 <th>地籍子区</th>
387 <td>所有权类型</td> 387 <th>所有权类型</th>
388 <td>土地特征码</td> 388 <th>土地特征码</th>
389 <td>项目名称</td> 389 <th>项目名称</th>
390 <td>幢信息</td> 390 <th>幢信息</th>
391 </tr> 391 </tr>
392 <tr v-for="(item,index) in fghData.newZdlist" :key="index"> 392 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
393 <td @click="delRow(index)">-</td> 393 <td @click="delRow(index)">-</td>
...@@ -505,7 +505,7 @@ ...@@ -505,7 +505,7 @@
505 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" 505 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
506 @close="close"></query-data> 506 @close="close"></query-data>
507 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 507 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
508 <el-button type="primary" @click="save">保存</el-button> 508 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
509 </div> 509 </div>
510 </div> 510 </div>
511 </el-tab-pane> 511 </el-tab-pane>
...@@ -860,13 +860,19 @@ ...@@ -860,13 +860,19 @@
860 position: absolute; 860 position: absolute;
861 right: 30px; 861 right: 30px;
862 top: -46px; 862 top: -46px;
863 z-index: 999;
863 } 864 }
864 table { 865 table {
865 margin-top: 10px; 866 margin-top: 10px;
866 background-color: #fff; 867 background-color: #fff;
867 font-size: 14px; 868 font-size: 14px;
868 width: 100%; 869 width: 100%;
869 870 tr:nth-of-type(odd){
871 background: #FAFAFA;
872 th{
873 height: 36px;
874 }
875 }
870 .formInput { 876 .formInput {
871 margin: 0; 877 margin: 0;
872 height: 36px; 878 height: 36px;
...@@ -906,9 +912,6 @@ ...@@ -906,9 +912,6 @@
906 bottom: 0; 912 bottom: 0;
907 text-align: center; 913 text-align: center;
908 background-color: #ffffff; 914 background-color: #ffffff;
909 /deep/ .el-button{
910 margin-top: 5px;
911 }
912 } 915 }
913 .xz-container { 916 .xz-container {
914 border: 1px solid #000; 917 border: 1px solid #000;
...@@ -920,4 +923,14 @@ ...@@ -920,4 +923,14 @@
920 color: #9B9B9B; 923 color: #9B9B9B;
921 } 924 }
922 } 925 }
926 .saveBtn{
927 background-color: #00CACD;
928 border-color: #00CACD;
929 padding: 10px 30px;
930 margin-top: 8px;
931 }
932 .saveBtn:hover{
933 background-color: rgba(0, 202, 205, .8);
934 border-color: rgba(0, 202, 205, .8);
935 }
923 </style> 936 </style>
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
13 <template slot-scope="scope"> 13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small" 14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理 15 >办理
16 </el-button 16 </el-button>
17 >
18 <el-button type="text" size="small">定位</el-button> 17 <el-button type="text" size="small">定位</el-button>
19 </template> 18 </template>
20 </el-table-column> 19 </el-table-column>
...@@ -26,23 +25,33 @@ ...@@ -26,23 +25,33 @@
26 </el-table-column> 25 </el-table-column>
27 <el-table-column prop="dylx" align="left" width="120" label="类型"> 26 <el-table-column prop="dylx" align="left" width="120" label="类型">
28 <template slot-scope="scope"> 27 <template slot-scope="scope">
29 {{scope.row.dylx | bdcLxFilter}} 28 {{ scope.row.dylx | bdcLxFilter }}
30 </template> 29 </template>
31 </el-table-column> 30 </el-table-column>
32 <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> 31 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
33 </el-table-column> 32 </el-table-column>
34 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 33 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
35 <el-table-column prop="addtime" align="left" width="120" label="转入时间"> 34 <el-table-column
35 prop="addtime"
36 align="left"
37 width="120"
38 label="转入时间"
39 >
36 <template slot-scope="scope"> 40 <template slot-scope="scope">
37 {{scope.row.addtime | timeFilter}} 41 {{ scope.row.addtime | timeFilter }}
38 </template> 42 </template>
39 </el-table-column> 43 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 44 <el-table-column prop="cjr" align="left" width="120" label="创建人">
41 </el-table-column> 45 </el-table-column>
42 </el-table> 46 </el-table>
43 <div class="pagination"> 47 <div class="pagination">
44 <el-pagination background layout="prev, pager, next" :total="total" 48 <el-pagination
45 :current-page="pageNo" @current-change="handleCurrentChange"> 49 background
50 layout="prev, pager, next,total"
51 :total="total"
52 :current-page="pageNo"
53 @current-change="handleCurrentChange"
54 >
46 </el-pagination> 55 </el-pagination>
47 </div> 56 </div>
48 </div> 57 </div>
...@@ -50,13 +59,13 @@ ...@@ -50,13 +59,13 @@
50 </template> 59 </template>
51 60
52 <script> 61 <script>
53 import SearchHead from "../../../../components/searchHead/searchHead"; 62 import SearchHead from "../../../../components/searchHead/searchHead";
54 import {getSearchList} from "../../../../api/search"; 63 import { getSearchList } from "../../../../api/search";
55 import {copyZdjbxx} from "../../../../api/common"; 64 import { copyZdjbxx } from "../../../../api/common";
56 65
57 export default { 66 export default {
58 name: "", 67 name: "",
59 components: {SearchHead}, 68 components: { SearchHead },
60 props: {}, 69 props: {},
61 data() { 70 data() {
62 return { 71 return {
...@@ -65,22 +74,23 @@ ...@@ -65,22 +74,23 @@
65 pageNo: 1, 74 pageNo: 1,
66 pageSize: 10, 75 pageSize: 10,
67 tableData: [], 76 tableData: [],
68 tableHeight: "100px", 77 tableHeight: "100",
69 queryData: {} 78 queryData: {},
70 }; 79 };
71 }, 80 },
72 created() { 81 created() {},
73 },
74 mounted() { 82 mounted() {
75 this.getData({}) 83 this.getData({});
76 this.$nextTick(()=>{ 84 // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
77 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 85 this.$nextTick(() => {
78 }) 86 this.tableHeight =
87 (document.documentElement.clientHeight || document.body.clientHeight) -
88 304;
89 });
79 }, 90 },
80 methods: { 91 methods: {
81 onSubmit() { 92 onSubmit() {},
82 }, 93 tableRowClassName({ row, rowIndex }) {
83 tableRowClassName({row, rowIndex}) {
84 if (rowIndex % 2 !== 0) { 94 if (rowIndex % 2 !== 0) {
85 return "even-row"; 95 return "even-row";
86 } else { 96 } else {
...@@ -94,24 +104,24 @@ ...@@ -94,24 +104,24 @@
94 this.getData(this.queryData); 104 this.getData(this.queryData);
95 }, 105 },
96 getData(data) { 106 getData(data) {
97 data['qszt'] = this.qszt 107 data["qszt"] = this.qszt;
98 getSearchList(data).then(res => { 108 getSearchList(data).then((res) => {
99 this.tableData = res.result.records 109 this.tableData = res.result.records;
100 this.total = res.result.total 110 this.total = res.result.total;
101 }) 111 });
102 }, 112 },
103 //获取子组件点击查询触发的事件 113 //获取子组件点击查询触发的事件
104 geQuerytData(obj) { 114 geQuerytData(obj) {
105 this.queryData = obj 115 this.queryData = obj;
106 //将obj作为参数调用接口查询表格数据 116 //将obj作为参数调用接口查询表格数据
107 this.queryData['pageSize'] = this.pageSize 117 this.queryData["pageSize"] = this.pageSize;
108 this.pageNo = 1 118 this.pageNo = 1;
109 this.queryData['pageNo'] = 1 119 this.queryData["pageNo"] = 1;
110 this.getData(this.queryData) 120 this.getData(this.queryData);
111 }, 121 },
112 //点击办理 122 //点击办理
113 handleClick(row) { 123 handleClick(row) {
114 console.log('fwsxbg'); 124 console.log("fwsxbg");
115 console.log(row); 125 console.log(row);
116 var bsm = row.glbsm; 126 var bsm = row.glbsm;
117 var type; 127 var type;
...@@ -119,7 +129,7 @@ ...@@ -119,7 +129,7 @@
119 switch (row.dylx) { 129 switch (row.dylx) {
120 case "zrz": 130 case "zrz":
121 type = "1"; 131 type = "1";
122 this.$store.state.zrzbsm = row.glbsm 132 this.$store.state.zrzbsm = row.glbsm;
123 path = "/zrz"; 133 path = "/zrz";
124 break; 134 break;
125 case "zd": 135 case "zd":
...@@ -128,15 +138,15 @@ ...@@ -128,15 +138,15 @@
128 path = "/zd"; 138 path = "/zd";
129 break; 139 break;
130 case "h": 140 case "h":
131 type = "2" 141 type = "2";
132 this.$store.state.hbsm = row.glbsm 142 this.$store.state.hbsm = row.glbsm;
133 break; 143 break;
134 default: 144 default:
135 break; 145 break;
136 } 146 }
137 var params = {"id": bsm, "type": type}; 147 var params = { id: bsm, type: type };
138 copyZdjbxx(params) 148 copyZdjbxx(params)
139 .then((res => { 149 .then((res) => {
140 if (res.code == 200) { 150 if (res.code == 200) {
141 this.$message({ 151 this.$message({
142 message: res.message, 152 message: res.message,
...@@ -148,7 +158,13 @@ ...@@ -148,7 +158,13 @@
148 type: "warning", 158 type: "warning",
149 }); 159 });
150 } 160 }
151 })); 161 })
162 .catch((error) => {
163 this.$message({
164 message: res.message,
165 type: "error",
166 });
167 });
152 //this.$router.push({ 168 //this.$router.push({
153 // path: path, 169 // path: path,
154 // query: { 170 // query: {
...@@ -160,17 +176,11 @@ ...@@ -160,17 +176,11 @@
160 }, 176 },
161 computed: {}, 177 computed: {},
162 watch: {}, 178 watch: {},
163 }; 179 };
164 </script> 180 </script>
165 <style scoped lang="less"> 181 <style scoped lang="less">
166 .main { 182 .main {
167 width: 100%; 183 background-color: #eaedf5;
168 height: 100%;
169 box-sizing: border-box;
170 padding: 0 18px !important;
171 display: flex;
172 flex-direction: column;
173 background-color: #fcfdff;
174 .demo-form-inline { 184 .demo-form-inline {
175 margin-top: 18px; 185 margin-top: 18px;
176 .moreSearchBtn { 186 .moreSearchBtn {
...@@ -185,8 +195,8 @@ ...@@ -185,8 +195,8 @@
185 .dataGrid { 195 .dataGrid {
186 flex: 1; 196 flex: 1;
187 .pagination { 197 .pagination {
188 padding: 18px 0; 198 padding: 18px 0 0 0;
189 }
190 } 199 }
191 } 200 }
201 }
192 </style> 202 </style>
......
1 <template> 1 <template>
2 <div> 2 <div class="hb" ref="hbBox">
3 <el-tabs v-model="tabName" @tab-click="handleClick"> 3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
4 <el-tab-pane label="宗地合并" name="zd"> 4 <el-tab-pane label="宗地合并" name="zd">
5 <div class="main"> 5 <div class="hb-tabs">
6
7 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
6 <div class="header"> 8 <div class="header">
7 <span>合并后项目名称:</span> 9 <span>合并后项目名称</span>
8 <el-input></el-input> 10 <el-input></el-input>
9
10 <el-button type="primary" @click="newAdd">新增</el-button>
11
12 <el-button type="primary">保存</el-button>
13 </div> 11 </div>
14 12
13 <div class="table">
15 <table border="1"> 14 <table border="1">
16 <tr> 15 <tr>
17 <td>序号</td> 16 <td>序号</td>
...@@ -37,21 +36,23 @@ ...@@ -37,21 +36,23 @@
37 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 36 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
38 </tr> 37 </tr>
39 </table> 38 </table>
39 </div>
40 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" 40 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
41 @close="close"></query-data> 41 @close="close"></query-data>
42
43 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
44 <el-button type="primary" class="saveBtn">保存</el-button>
45 </div>
42 </div> 46 </div>
43 </el-tab-pane> 47 </el-tab-pane>
44 <el-tab-pane label="多幢合并" name="dz"> 48 <el-tab-pane label="多幢合并" name="dz">
45 <div class="main"> 49 <div class="hb-tabs">
50 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
46 <div class="header"> 51 <div class="header">
47 <span>合并后项目名称:</span> 52 <span>合并后项目名称</span>
48 <el-input></el-input> 53 <el-input></el-input>
49
50 <el-button type="primary" @click="newAdd">新增</el-button>
51
52 <el-button type="primary">保存</el-button>
53 </div> 54 </div>
54 55 <div class="table">
55 <table border="1"> 56 <table border="1">
56 <tr> 57 <tr>
57 <td>序号</td> 58 <td>序号</td>
...@@ -77,21 +78,22 @@ ...@@ -77,21 +78,22 @@
77 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 78 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
78 </tr> 79 </tr>
79 </table> 80 </table>
81 </div>
80 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" 82 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
81 @close="close"></query-data> 83 @close="close"></query-data>
84 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
85 <el-button type="primary" class="saveBtn">保存</el-button>
86 </div>
82 </div> 87 </div>
83 </el-tab-pane> 88 </el-tab-pane>
84 <el-tab-pane label="户合并" name="h"> 89 <el-tab-pane label="户合并" name="h">
85 <div class="main"> 90 <div class="hb-tabs">
91 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
86 <div class="header"> 92 <div class="header">
87 <span>合并后项目名称:</span> 93 <span>合并后项目名称</span>
88 <el-input></el-input> 94 <el-input></el-input>
89
90 <el-button type="primary" @click="newAdd">新增</el-button>
91
92 <el-button type="primary">保存</el-button>
93 </div> 95 </div>
94 96 <div class="table">
95 <table border="1"> 97 <table border="1">
96 <tr> 98 <tr>
97 <td>序号</td> 99 <td>序号</td>
...@@ -117,8 +119,12 @@ ...@@ -117,8 +119,12 @@
117 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 119 <td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
118 </tr> 120 </tr>
119 </table> 121 </table>
122 </div>
120 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" 123 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
121 @close="close"></query-data> 124 @close="close"></query-data>
125 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
126 <el-button type="primary" class="saveBtn">保存</el-button>
127 </div>
122 </div> 128 </div>
123 </el-tab-pane> 129 </el-tab-pane>
124 </el-tabs> 130 </el-tabs>
...@@ -136,12 +142,16 @@ ...@@ -136,12 +142,16 @@
136 return { 142 return {
137 tabName: 'zd', 143 tabName: 'zd',
138 centerDialogVisible: false, 144 centerDialogVisible: false,
139 bgqData: [] 145 bgqData: [],
146 fgBoxWidth:0
140 } 147 }
141 }, 148 },
142 created() { 149 created() {
143 }, 150 },
144 mounted() { 151 mounted() {
152 this.$nextTick(()=>{
153 this.fgBoxWidth = this.$refs.hbBox.clientWidth;
154 })
145 }, 155 },
146 methods: { 156 methods: {
147 handleClick(tab, event) { 157 handleClick(tab, event) {
...@@ -166,17 +176,71 @@ ...@@ -166,17 +176,71 @@
166 } 176 }
167 </script> 177 </script>
168 <style scoped lang="less"> 178 <style scoped lang="less">
169 .main { 179
180 .hb{
181 .menu{
182 /deep/.el-tabs__content{
183 position: unset;
184 margin-top: 62px;
185 overflow: visible;
186 }
187 /deep/.el-tabs__header{
188 position: -webkit-fixed;
189 position: fixed;
190 top: 120px;
191 z-index: 999;
192 width: 100%;
193 margin-bottom: 0;
194 border: 0;
195 /deep/.el-tabs__nav-scroll{
196 height: 50px;
170 box-sizing: border-box; 197 box-sizing: border-box;
171 padding: 18px; 198 padding-left: 20px;
199 .el-tabs__active-bar{
200 display: none;
201 }
202 >.el-tabs__nav{
203 border: 0;
204 >.el-tabs__item{
205 border: 1px solid #DEDEDE;
206 height: 36px;
207 line-height: 36px;
208 padding: 0 20px;
209 margin: 9px 10px 9px 0;
210 background-color: #ffffff;
211 }
212 .is-active{
213 color: #006CFF;
214 border: 1px solid #006CFF;
215 }
216 }
217 }
218 /deep/.el-tabs__nav-wrap::after{
219 width: 0;
220 }
221 }
222 }
223 }
224 .hb-tabs {
172 height: auto; 225 height: auto;
173 width: 80%; 226 width: 100%;
227 position: relative;
228
229 .addBtn{
230 position: absolute;
231 right: 30px;
232 top: -46px;
233 z-index: 999;
234 }
174 .header { 235 .header {
236 box-sizing: border-box;
237 padding: 18px 18px 0 18px;
175 display: flex; 238 display: flex;
176 justify-items: left; 239 justify-items: left;
177 span { 240 span {
178 width: 130px; 241 width: 130px;
179 line-height: 40px; 242 line-height: 40px;
243 color: #9B9B9B;
180 } 244 }
181 .el-input { 245 .el-input {
182 width: 200px; 246 width: 200px;
...@@ -184,12 +248,28 @@ ...@@ -184,12 +248,28 @@
184 } 248 }
185 } 249 }
186 250
251 .header-button {
252 height: 50px;
253 position: fixed;
254 bottom: 0;
255 text-align: center;
256 background-color: #ffffff;
257 }
258 .table{
259 box-sizing: border-box;
260 padding: 0 18px;
261 }
187 table { 262 table {
188 margin-top: 10px; 263 margin-top: 10px;
189 background-color: #fff; 264 background-color: #fff;
190 font-size: 14px; 265 font-size: 14px;
191 width: 100%; 266 width: 100%;
192 267 tr:nth-of-type(odd){
268 background: #FAFAFA;
269 th{
270 height: 36px;
271 }
272 }
193 .formInput { 273 .formInput {
194 margin: 0; 274 margin: 0;
195 height: 36px; 275 height: 36px;
...@@ -215,5 +295,15 @@ ...@@ -215,5 +295,15 @@
215 .noData { 295 .noData {
216 color: #b2b2b2; 296 color: #b2b2b2;
217 } 297 }
298 .saveBtn{
299 background-color: #00CACD;
300 border-color: #00CACD;
301 padding: 10px 30px;
302 margin-top: 8px;
303 }
304 .saveBtn:hover{
305 background-color: rgba(0, 202, 205, .8);
306 border-color: rgba(0, 202, 205, .8);
307 }
218 } 308 }
219 </style> 309 </style>
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane> 4 <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb></hb></el-tab-pane> 5 <el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg></fwsxbg></el-tab-pane> 6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane> 7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane>
8 </el-tabs> 8 </el-tabs>
9 </div> 9 </div>
...@@ -23,11 +23,19 @@ export default { ...@@ -23,11 +23,19 @@ export default {
23 data() { 23 data() {
24 return { 24 return {
25 activeName: "fg", 25 activeName: "fg",
26 hbLoad:false, //默认不加载合并tab
27 fwsxbgLoad:false, //默认不加载范围属性变更tab
26 }; 28 };
27 }, 29 },
28 methods: { 30 methods: {
29 handleClick(tab, event) { 31 handleClick(tab, event) {
30 console.log(tab, event); 32 console.log(tab.name);
33 if(!this.hbLoad){
34 this.hbLoad = tab.name == 'hb' ? true : false
35 }
36 if(!this.fwsxbgLoad){
37 this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
38 }
31 }, 39 },
32 }, 40 },
33 created() {}, 41 created() {},
......