Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
12 changed files
with
278 additions
and
33 deletions
... | @@ -9,3 +9,11 @@ export function getSearchList(data) { | ... | @@ -9,3 +9,11 @@ export function getSearchList(data) { |
9 | data : data, | 9 | data : data, |
10 | }) | 10 | }) |
11 | } | 11 | } |
12 | |||
13 | export function zdlist(data) { | ||
14 | return request({ | ||
15 | url: '/zd/qjZdjbxx/zdlist', | ||
16 | method: 'post', | ||
17 | data:data | ||
18 | }) | ||
19 | } | ... | ... |
... | @@ -91,7 +91,7 @@ | ... | @@ -91,7 +91,7 @@ |
91 | </template> | 91 | </template> |
92 | 92 | ||
93 | <script> | 93 | <script> |
94 | import {getSearchList} from './../../api/search' | 94 | import {zdlist} from './../../api/search' |
95 | import {zrzcxlz} from './../../api/h' | 95 | import {zrzcxlz} from './../../api/h' |
96 | import {Message} from 'element-ui' | 96 | import {Message} from 'element-ui' |
97 | 97 | ||
... | @@ -103,9 +103,8 @@ | ... | @@ -103,9 +103,8 @@ |
103 | queryData: { | 103 | queryData: { |
104 | bdcdyh: "", | 104 | bdcdyh: "", |
105 | bdcqzh: "", | 105 | bdcqzh: "", |
106 | dylxs: ['zd'], | ||
107 | qlrmc: "", | 106 | qlrmc: "", |
108 | qszt: "2", | 107 | qszt: ["2"], |
109 | xmmc: "", | 108 | xmmc: "", |
110 | zddm: "", | 109 | zddm: "", |
111 | zl: "", | 110 | zl: "", |
... | @@ -141,7 +140,7 @@ | ... | @@ -141,7 +140,7 @@ |
141 | }, | 140 | }, |
142 | methods: { | 141 | methods: { |
143 | saveNotarize: function (val) { | 142 | saveNotarize: function (val) { |
144 | this.zdbsm = val.glbsm; | 143 | this.zdbsm = val.zdbsm; |
145 | this.$confirm('将落宗在该宗地上, 是否继续?', '提示', { | 144 | this.$confirm('将落宗在该宗地上, 是否继续?', '提示', { |
146 | confirmButtonText: '确定', | 145 | confirmButtonText: '确定', |
147 | cancelButtonText: '取消', | 146 | cancelButtonText: '取消', |
... | @@ -176,7 +175,7 @@ | ... | @@ -176,7 +175,7 @@ |
176 | bdcdyh: "", | 175 | bdcdyh: "", |
177 | bdcqzh: "", | 176 | bdcqzh: "", |
178 | qlrmc: "", | 177 | qlrmc: "", |
179 | qszt: "2", | 178 | qszt: ["2"], |
180 | xmmc: "", | 179 | xmmc: "", |
181 | zddm: "", | 180 | zddm: "", |
182 | zl: "", | 181 | zl: "", |
... | @@ -186,8 +185,7 @@ | ... | @@ -186,8 +185,7 @@ |
186 | this.getData(this.queryData) | 185 | this.getData(this.queryData) |
187 | }, | 186 | }, |
188 | getData: function (data) { | 187 | getData: function (data) { |
189 | data['dylxs'] = this.dylxs; | 188 | zdlist(data).then(res => { |
190 | getSearchList(data).then(res => { | ||
191 | this.Data = res.result.records | 189 | this.Data = res.result.records |
192 | this.total = res.result.total; | 190 | this.total = res.result.total; |
193 | }) | 191 | }) | ... | ... |
... | @@ -64,19 +64,19 @@ | ... | @@ -64,19 +64,19 @@ |
64 | <el-button type="primary" @click="save">保存</el-button> | 64 | <el-button type="primary" @click="save">保存</el-button> |
65 | <el-button type="primary" @click="cancel">取消</el-button> | 65 | <el-button type="primary" @click="cancel">取消</el-button> |
66 | </div> | 66 | </div> |
67 | <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" | 67 | <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" |
68 | :isZdClose="true"></query-data> | 68 | :isZdClose="true"></zd-query-data> |
69 | </el-dialog> | 69 | </el-dialog> |
70 | </template> | 70 | </template> |
71 | 71 | ||
72 | <script> | 72 | <script> |
73 | import queryData from './../../components/queryData/queryData' | 73 | import zdQueryData from './../../components/zdQueryData/zdQueryData' |
74 | import {zdXlcd, hzl} from './../../api/zd' | 74 | import {zdXlcd, hzl} from './../../api/zd' |
75 | import {Message} from 'element-ui' | 75 | import {Message} from 'element-ui' |
76 | 76 | ||
77 | export default { | 77 | export default { |
78 | name: "hCxlz", | 78 | name: "hCxlz", |
79 | components: {queryData}, | 79 | components: {zdQueryData}, |
80 | data() { | 80 | data() { |
81 | return { | 81 | return { |
82 | zd: {}, | 82 | zd: {}, | ... | ... |
... | @@ -107,7 +107,7 @@ | ... | @@ -107,7 +107,7 @@ |
107 | bdcqzh: "", | 107 | bdcqzh: "", |
108 | dylxs: ['zd'], | 108 | dylxs: ['zd'], |
109 | qlrmc: "", | 109 | qlrmc: "", |
110 | qszt: "2", | 110 | qszt: ["2"], |
111 | xmmc: "", | 111 | xmmc: "", |
112 | zddm: "", | 112 | zddm: "", |
113 | zl: "", | 113 | zl: "", |
... | @@ -151,7 +151,7 @@ | ... | @@ -151,7 +151,7 @@ |
151 | bdcdyh: "", | 151 | bdcdyh: "", |
152 | bdcqzh: "", | 152 | bdcqzh: "", |
153 | qlrmc: "", | 153 | qlrmc: "", |
154 | qszt: "2", | 154 | qszt: ["2"], |
155 | xmmc: "", | 155 | xmmc: "", |
156 | zddm: "", | 156 | zddm: "", |
157 | zl: "", | 157 | zl: "", | ... | ... |
... | @@ -103,7 +103,7 @@ export default { | ... | @@ -103,7 +103,7 @@ export default { |
103 | bdcqzh: "", | 103 | bdcqzh: "", |
104 | dylxs: [], | 104 | dylxs: [], |
105 | qlrmc: "", | 105 | qlrmc: "", |
106 | qszt: "", | 106 | qszt: [], |
107 | xmmc: "", | 107 | xmmc: "", |
108 | zddm: "", | 108 | zddm: "", |
109 | zl: "", | 109 | zl: "", |
... | @@ -131,7 +131,7 @@ export default { | ... | @@ -131,7 +131,7 @@ export default { |
131 | bdcqzh: "", | 131 | bdcqzh: "", |
132 | dylxs: [], | 132 | dylxs: [], |
133 | qlrmc: "", | 133 | qlrmc: "", |
134 | qszt: "", | 134 | qszt: [], |
135 | xmmc: "", | 135 | xmmc: "", |
136 | zddm: "", | 136 | zddm: "", |
137 | zl: "", | 137 | zl: "", | ... | ... |
src/components/zdQueryData/zdQueryData.vue
0 → 100644
1 | <template> | ||
2 | <div> | ||
3 | <el-dialog | ||
4 | title="新增" | ||
5 | :visible.sync="isVisible" | ||
6 | width="50%" | ||
7 | @close="close" | ||
8 | :modal-append-to-body="false" | ||
9 | center> | ||
10 | <div class="search"> | ||
11 | <el-button type="primary" @click="search">查询</el-button> | ||
12 | <el-button type="primary" @click="result">重置</el-button> | ||
13 | <el-row :gutter="10" class="shop"> | ||
14 | <el-col :span="4" class="inputtitle"> | ||
15 | 宗地编码: | ||
16 | </el-col> | ||
17 | <el-col :span="8" class=""> | ||
18 | <el-input v-model="queryData.zddm"></el-input> | ||
19 | </el-col> | ||
20 | <el-col :span="4" class="inputtitle"> | ||
21 | 不动产权证号: | ||
22 | </el-col> | ||
23 | <el-col :span="8" class=""> | ||
24 | <el-input v-model="queryData.bdcqzh"></el-input> | ||
25 | </el-col> | ||
26 | </el-row> | ||
27 | <el-row :gutter="10"> | ||
28 | <el-col :span="4" class="inputtitle"> | ||
29 | 不动产权单元号: | ||
30 | </el-col> | ||
31 | <el-col :span="8"> | ||
32 | <el-input v-model="queryData.bdcdyh"></el-input> | ||
33 | </el-col> | ||
34 | <el-col :span="4" class="inputtitle"> | ||
35 | 权利人: | ||
36 | </el-col> | ||
37 | <el-col :span="8"> | ||
38 | <el-input v-model="queryData.qlrmc"></el-input> | ||
39 | </el-col> | ||
40 | </el-row> | ||
41 | <el-row :gutter="10"> | ||
42 | <el-col :span="4" class="inputtitle"> | ||
43 | 坐落: | ||
44 | </el-col> | ||
45 | <el-col :span="8"> | ||
46 | <el-input v-model="queryData.zl"></el-input> | ||
47 | </el-col> | ||
48 | </el-row> | ||
49 | <table border="1"> | ||
50 | <tr> | ||
51 | <td>序号</td> | ||
52 | <td>操作</td> | ||
53 | <td>宗地代码</td> | ||
54 | <td>不动产单元号</td> | ||
55 | <td>项目名称</td> | ||
56 | <td>不动产权证号</td> | ||
57 | <td>权利人</td> | ||
58 | <td>坐落</td> | ||
59 | </tr> | ||
60 | <tr v-if="Data.length==0"> | ||
61 | <td colspan="8"> | ||
62 | <span class="noData">暂无数据</span> | ||
63 | </td> | ||
64 | </tr> | ||
65 | <tr v-else v-for="(item,index) in Data" :key="index"> | ||
66 | <td>{{index+1}}</td> | ||
67 | <td @click="addData(item)" class="xz"> | ||
68 | <span>选择</span> | ||
69 | </td> | ||
70 | <td>{{item.zddm}}</td> | ||
71 | <td>{{item.bdcdyh}}</td> | ||
72 | <td>{{item.xmmc}}</td> | ||
73 | <td>{{item.bdcqzh}}</td> | ||
74 | <td>{{item.qlr}}</td> | ||
75 | <td>{{item.zl}}</td> | ||
76 | </tr> | ||
77 | |||
78 | </table> | ||
79 | </div> | ||
80 | <span slot="footer" class="dialog-footer"> | ||
81 | </span> | ||
82 | <div class="page"> | ||
83 | <el-pagination | ||
84 | background | ||
85 | layout="prev, pager, next,total" | ||
86 | :page-size="queryData.pageSize" | ||
87 | :total="total" | ||
88 | @current-change="currentChange" | ||
89 | > | ||
90 | </el-pagination> | ||
91 | </div> | ||
92 | </el-dialog> | ||
93 | |||
94 | </div> | ||
95 | </template> | ||
96 | |||
97 | <script> | ||
98 | import {zdlist} from './../../api/search' | ||
99 | |||
100 | export default { | ||
101 | name: "zdQueryData", | ||
102 | data() { | ||
103 | return { | ||
104 | total:1, | ||
105 | queryData: { | ||
106 | bdcdyh: "", | ||
107 | bdcqzh: "", | ||
108 | dylxs: ['zd'], | ||
109 | qlrmc: "", | ||
110 | qszt: ["2"], | ||
111 | xmmc: "", | ||
112 | zddm: "", | ||
113 | zl: "", | ||
114 | pageNo: 1, | ||
115 | pageSize: 10, | ||
116 | }, | ||
117 | Data: [], | ||
118 | isVisible: false | ||
119 | } | ||
120 | }, | ||
121 | props: { | ||
122 | centerDialogVisible: { | ||
123 | type: Boolean, | ||
124 | default: function () { | ||
125 | return false | ||
126 | } | ||
127 | }, | ||
128 | qszt:{ | ||
129 | type:Array, | ||
130 | default:function () { | ||
131 | return ['2'] | ||
132 | } | ||
133 | }, | ||
134 | isZdClose:{ | ||
135 | type:Boolean, | ||
136 | default:false | ||
137 | } | ||
138 | }, | ||
139 | mounted() { | ||
140 | this.getData(this.queryData) | ||
141 | }, | ||
142 | created() { | ||
143 | }, | ||
144 | methods: { | ||
145 | currentChange: function (val) { | ||
146 | this.queryData.pageNo = val; | ||
147 | this.getData(this.queryData); | ||
148 | }, | ||
149 | result: function () { | ||
150 | this.queryData = { | ||
151 | bdcdyh: "", | ||
152 | bdcqzh: "", | ||
153 | qlrmc: "", | ||
154 | qszt: ["2"], | ||
155 | xmmc: "", | ||
156 | zddm: "", | ||
157 | zl: "", | ||
158 | pageNo: 1, | ||
159 | pageSize: 10 | ||
160 | }; | ||
161 | this.getData(this.queryData) | ||
162 | }, | ||
163 | getData: function (data) { | ||
164 | data['dylxs'] = this.dylxs; | ||
165 | zdlist(data).then(res => { | ||
166 | this.Data = res.result.records | ||
167 | this.total = res.result.total; | ||
168 | }) | ||
169 | }, | ||
170 | search: function () { | ||
171 | this.getData(this.queryData) | ||
172 | }, | ||
173 | addData: function (val) { | ||
174 | this.$emit("getData", val) | ||
175 | if (this.isZdClose) { | ||
176 | this.close(); | ||
177 | } | ||
178 | }, | ||
179 | close: function () { | ||
180 | this.$emit('close') | ||
181 | this.result(); | ||
182 | } | ||
183 | }, | ||
184 | watch: { | ||
185 | centerDialogVisible(val) { | ||
186 | this.isVisible = val | ||
187 | } | ||
188 | } | ||
189 | } | ||
190 | </script> | ||
191 | |||
192 | <style scoped lang="less"> | ||
193 | |||
194 | .main { | ||
195 | box-sizing: border-box; | ||
196 | padding: 18px; | ||
197 | height: auto; | ||
198 | width: 80%; | ||
199 | } | ||
200 | |||
201 | table { | ||
202 | margin-top: 10px; | ||
203 | background-color: #fff; | ||
204 | font-size: 14px; | ||
205 | width: 100%; | ||
206 | tr:hover{ | ||
207 | background-color: #F5F7FA; | ||
208 | } | ||
209 | } | ||
210 | |||
211 | td { | ||
212 | text-align: center; | ||
213 | height: 36px; | ||
214 | min-width: 50px; | ||
215 | } | ||
216 | |||
217 | table:hover { | ||
218 | cursor: pointer; | ||
219 | } | ||
220 | |||
221 | .inputtitle { | ||
222 | line-height: 40px; | ||
223 | } | ||
224 | |||
225 | .shop { | ||
226 | margin-top: 20px; | ||
227 | } | ||
228 | |||
229 | .xz { | ||
230 | color: blue; | ||
231 | } | ||
232 | |||
233 | .noData { | ||
234 | color: #b2b2b2; | ||
235 | } | ||
236 | |||
237 | </style> |
... | @@ -61,7 +61,7 @@ | ... | @@ -61,7 +61,7 @@ |
61 | total: 0, | 61 | total: 0, |
62 | pageNo: 1, | 62 | pageNo: 1, |
63 | pageSize: 10, | 63 | pageSize: 10, |
64 | qszt: 1, | 64 | qszt: ['1', '2'], |
65 | queryData: {}, | 65 | queryData: {}, |
66 | formData: { | 66 | formData: { |
67 | user: "", | 67 | user: "", |
... | @@ -80,8 +80,8 @@ | ... | @@ -80,8 +80,8 @@ |
80 | pageSize: this.pageSize, | 80 | pageSize: this.pageSize, |
81 | }) | 81 | }) |
82 | this.$nextTick(() => { | 82 | this.$nextTick(() => { |
83 | this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; | 83 | this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; |
84 | }); | 84 | }); |
85 | }, | 85 | }, |
86 | methods: { | 86 | methods: { |
87 | handleCurrentChange(val) { | 87 | handleCurrentChange(val) { | ... | ... |
... | @@ -121,7 +121,7 @@ export default { | ... | @@ -121,7 +121,7 @@ export default { |
121 | bdcqzh: "", | 121 | bdcqzh: "", |
122 | dylxs: ["zrz"], | 122 | dylxs: ["zrz"], |
123 | qlrmc: "", | 123 | qlrmc: "", |
124 | qszt: "2", | 124 | qszt: ["2"], |
125 | xmmc: "", | 125 | xmmc: "", |
126 | zddm: "", | 126 | zddm: "", |
127 | zl: "", | 127 | zl: "", |
... | @@ -171,7 +171,7 @@ export default { | ... | @@ -171,7 +171,7 @@ export default { |
171 | bdcqzh: "", | 171 | bdcqzh: "", |
172 | dylxs: ["zrz"], | 172 | dylxs: ["zrz"], |
173 | qlrmc: "", | 173 | qlrmc: "", |
174 | qszt: "2", | 174 | qszt: ["2"], |
175 | xmmc: "", | 175 | xmmc: "", |
176 | zddm: "", | 176 | zddm: "", |
177 | zl: "", | 177 | zl: "", | ... | ... |
... | @@ -186,8 +186,8 @@ | ... | @@ -186,8 +186,8 @@ |
186 | </div> | 186 | </div> |
187 | </el-dialog> | 187 | </el-dialog> |
188 | 188 | ||
189 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true" | 189 | <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true" |
190 | @close="close"></query-data> | 190 | @close="close"></zd-query-data> |
191 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> | 191 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> |
192 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> | 192 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> |
193 | </div> | 193 | </div> |
... | @@ -589,12 +589,13 @@ | ... | @@ -589,12 +589,13 @@ |
589 | } from "./../../../../api/common"; | 589 | } from "./../../../../api/common"; |
590 | import {getQjZdjbxxDetailById} from './../../../../api/zd' | 590 | import {getQjZdjbxxDetailById} from './../../../../api/zd' |
591 | import QueryData from './../../../../components/queryData/queryData' | 591 | import QueryData from './../../../../components/queryData/queryData' |
592 | import zdQueryData from './../../../../components/zdQueryData/zdQueryData' | ||
592 | import {zdfg} from './../../../../api/zd' | 593 | import {zdfg} from './../../../../api/zd' |
593 | import {Message} from 'element-ui' | 594 | import {Message} from 'element-ui' |
594 | 595 | ||
595 | export default { | 596 | export default { |
596 | name: "", | 597 | name: "", |
597 | components: {QueryData}, | 598 | components: {QueryData,zdQueryData}, |
598 | props: {}, | 599 | props: {}, |
599 | data() { | 600 | data() { |
600 | return { | 601 | return { | ... | ... |
... | @@ -69,7 +69,7 @@ export default { | ... | @@ -69,7 +69,7 @@ export default { |
69 | props: {}, | 69 | props: {}, |
70 | data() { | 70 | data() { |
71 | return { | 71 | return { |
72 | qszt: 2, | 72 | qszt: ['2'], |
73 | total: 0, | 73 | total: 0, |
74 | pageNo: 1, | 74 | pageNo: 1, |
75 | pageSize: 10, | 75 | pageSize: 10, |
... | @@ -170,11 +170,11 @@ export default { | ... | @@ -170,11 +170,11 @@ export default { |
170 | message: res.message, | 170 | message: res.message, |
171 | type: "error", | 171 | type: "error", |
172 | }); | 172 | }); |
173 | }); | 173 | }); |
174 | }).catch(() => { | 174 | }).catch(() => { |
175 | 175 | ||
176 | }); | 176 | }); |
177 | 177 | ||
178 | }, | 178 | }, |
179 | }, | 179 | }, |
180 | computed: {}, | 180 | computed: {}, | ... | ... |
... | @@ -110,8 +110,8 @@ | ... | @@ -110,8 +110,8 @@ |
110 | </tr> | 110 | </tr> |
111 | </table> | 111 | </table> |
112 | </div> | 112 | </div> |
113 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" | 113 | <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" |
114 | @close="close"></query-data> | 114 | @close="close"></zd-query-data> |
115 | 115 | ||
116 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> | 116 | <div class="header-button" :style="{width:fgBoxWidth+'px'}"> |
117 | <el-button type="primary" class="saveBtn">保存</el-button> | 117 | <el-button type="primary" class="saveBtn">保存</el-button> |
... | @@ -362,10 +362,11 @@ | ... | @@ -362,10 +362,11 @@ |
362 | getDdicByMC | 362 | getDdicByMC |
363 | } from "./../../../../api/common"; | 363 | } from "./../../../../api/common"; |
364 | import QueryData from './../../../../components/queryData/queryData' | 364 | import QueryData from './../../../../components/queryData/queryData' |
365 | import zdQueryData from './../../../../components/zdQueryData/zdQueryData' | ||
365 | 366 | ||
366 | export default { | 367 | export default { |
367 | name: "", | 368 | name: "", |
368 | components: {QueryData}, | 369 | components: {QueryData,zdQueryData}, |
369 | props: {}, | 370 | props: {}, |
370 | data() { | 371 | data() { |
371 | return { | 372 | return { | ... | ... |
... | @@ -60,7 +60,7 @@ | ... | @@ -60,7 +60,7 @@ |
60 | props: {}, | 60 | props: {}, |
61 | data() { | 61 | data() { |
62 | return { | 62 | return { |
63 | qszt: 1, | 63 | qszt: ['1'], |
64 | total: 0, | 64 | total: 0, |
65 | pageNo: 1, | 65 | pageNo: 1, |
66 | pageSize: 10, | 66 | pageSize: 10, |
... | @@ -167,9 +167,9 @@ | ... | @@ -167,9 +167,9 @@ |
167 | type: "error", | 167 | type: "error", |
168 | }); | 168 | }); |
169 | }); | 169 | }); |
170 | 170 | ||
171 | }).catch(() => { | 171 | }).catch(() => { |
172 | 172 | ||
173 | }); | 173 | }); |
174 | }, | 174 | }, |
175 | }, | 175 | }, | ... | ... |
-
Please register or sign in to post a comment