Merge remote-tracking branch 'origin/master'
Showing
11 changed files
with
463 additions
and
117 deletions
... | @@ -51,8 +51,8 @@ | ... | @@ -51,8 +51,8 @@ |
51 | @click="handleInClick(index, childIndex, 'minus')" | 51 | @click="handleInClick(index, childIndex, 'minus')" |
52 | >-</el-button | 52 | >-</el-button |
53 | > | 53 | > |
54 | <!-- </template> --> | ||
55 | </el-col> | 54 | </el-col> |
55 | <template v-if="hasSyqx"> | ||
56 | <el-col | 56 | <el-col |
57 | :span="3" | 57 | :span="3" |
58 | :key="childIndex + '7'" | 58 | :key="childIndex + '7'" |
... | @@ -230,6 +230,116 @@ | ... | @@ -230,6 +230,116 @@ |
230 | </ul> | 230 | </ul> |
231 | </el-col> | 231 | </el-col> |
232 | </template> | 232 | </template> |
233 | <template v-if="!hasSyqx"> | ||
234 | <el-col | ||
235 | :span="5" | ||
236 | :key="childIndex + '7'" | ||
237 | :class="childIndex > 0 ? 'childYT' : ''" | ||
238 | > | ||
239 | <ul> | ||
240 | <li>批准用途</li> | ||
241 | <li>实际用途</li> | ||
242 | <li>土地使用起始时间<i class="requisite">*</i></li> | ||
243 | </ul> | ||
244 | </el-col> | ||
245 | <el-col | ||
246 | :span="5" | ||
247 | :key="childIndex + '6'" | ||
248 | :class="childIndex > 0 ? 'childYT' : ''" | ||
249 | > | ||
250 | <ul> | ||
251 | <li> | ||
252 | <el-select-tree | ||
253 | v-if="show" | ||
254 | :default-expand-all="defaultExpandAll" | ||
255 | :multiple="multiple" | ||
256 | :placeholder="placeholder" | ||
257 | :disabled="disabled" | ||
258 | :data="$store.state.tdytList" | ||
259 | :props="treeProps" | ||
260 | :check-strictly="checkStrictly" | ||
261 | :clearable="clearable" | ||
262 | v-model="childItem.pzytdm" | ||
263 | ></el-select-tree> | ||
264 | </li> | ||
265 | <li> | ||
266 | <el-select-tree | ||
267 | v-if="show" | ||
268 | :default-expand-all="defaultExpandAll" | ||
269 | :multiple="multiple" | ||
270 | :placeholder="placeholder" | ||
271 | :disabled="disabled" | ||
272 | :data="$store.state.tdytList" | ||
273 | :props="treeProps" | ||
274 | :check-strictly="checkStrictly" | ||
275 | :clearable="clearable" | ||
276 | v-model="childItem.sjytdm" | ||
277 | ></el-select-tree> | ||
278 | </li> | ||
279 | <li> | ||
280 | <el-date-picker | ||
281 | v-model="childItem.tdsyqssj" | ||
282 | ref="tdsyqssj" | ||
283 | :picker-options="childItem.pickerStart" | ||
284 | type="date" | ||
285 | value-format="yyyy-MM-dd" | ||
286 | placeholder="选择日期" | ||
287 | @input="startTime(index,childIndex)" | ||
288 | > | ||
289 | </el-date-picker> | ||
290 | </li> | ||
291 | </ul> | ||
292 | </el-col> | ||
293 | <el-col | ||
294 | :span="5" | ||
295 | :key="childIndex + '5'" | ||
296 | :class="childIndex > 0 ? 'childYT' : ''" | ||
297 | > | ||
298 | <ul> | ||
299 | <li>地类编码</li> | ||
300 | <li>地类编码</li> | ||
301 | <li>土地使用结束时间<i class="requisite">*</i></li> | ||
302 | </ul> | ||
303 | </el-col> | ||
304 | <el-col | ||
305 | :span="5" | ||
306 | :key="childIndex + '4'" | ||
307 | :class="childIndex > 0 ? 'childYT' : ''" | ||
308 | > | ||
309 | <ul> | ||
310 | <li> | ||
311 | <input | ||
312 | type="text" | ||
313 | style="top: -1px;" | ||
314 | |||
315 | v-model="childItem.pzytdm" | ||
316 | class="formInput" | ||
317 | /> | ||
318 | </li> | ||
319 | <li> | ||
320 | <input | ||
321 | type="text" | ||
322 | |||
323 | v-model="childItem.sjytdm" | ||
324 | class="formInput" | ||
325 | /> | ||
326 | </li> | ||
327 | <li> | ||
328 | <el-date-picker | ||
329 | v-model="childItem.tdsyjssj" | ||
330 | ref="tdsyjssj" | ||
331 | type="date" | ||
332 | value-format="yyyy-MM-dd" | ||
333 | :picker-options="childItem.pickerEnd" | ||
334 | placeholder="选择日期" | ||
335 | @input="endTime(index,childIndex)" | ||
336 | > | ||
337 | </el-date-picker> | ||
338 | </li> | ||
339 | </ul> | ||
340 | </el-col> | ||
341 | </template> | ||
342 | </template> | ||
233 | 343 | ||
234 | <div class="title"> | 344 | <div class="title"> |
235 | <el-select-tree | 345 | <el-select-tree |
... | @@ -260,6 +370,10 @@ export default { | ... | @@ -260,6 +370,10 @@ export default { |
260 | return {}; | 370 | return {}; |
261 | }, | 371 | }, |
262 | }, | 372 | }, |
373 | hasSyqx:{ | ||
374 | type:Boolean, | ||
375 | default:false | ||
376 | } | ||
263 | }, | 377 | }, |
264 | data() { | 378 | data() { |
265 | return { | 379 | return { |
... | @@ -348,7 +462,6 @@ export default { | ... | @@ -348,7 +462,6 @@ export default { |
348 | this.countList[index].list[childIndex].tdsyjssj = Number(startTime.substring(0,4))+Number(syqx)+startTime.slice(4,10); | 462 | this.countList[index].list[childIndex].tdsyjssj = Number(startTime.substring(0,4))+Number(syqx)+startTime.slice(4,10); |
349 | }, | 463 | }, |
350 | endTime(index,childIndex,e){ | 464 | endTime(index,childIndex,e){ |
351 | console.log(e,'eeeeee'); | ||
352 | let startTime = this.countList[index].list[childIndex].tdsyqssj; | 465 | let startTime = this.countList[index].list[childIndex].tdsyqssj; |
353 | let endTime = this.countList[index].list[childIndex].tdsyjssj; | 466 | let endTime = this.countList[index].list[childIndex].tdsyjssj; |
354 | this.countList[index].list[childIndex].pickerStart={ | 467 | this.countList[index].list[childIndex].pickerStart={ |
... | @@ -479,13 +592,6 @@ export default { | ... | @@ -479,13 +592,6 @@ export default { |
479 | rule: /^\s*$/g, //非空 | 592 | rule: /^\s*$/g, //非空 |
480 | }, | 593 | }, |
481 | { | 594 | { |
482 | data:item.list[ind].syqx, | ||
483 | name:'使用期限', | ||
484 | dom:this.$refs.syqx[temp+ind], | ||
485 | // val:this.$refs.syqx[temp+ind].value, | ||
486 | rule: /^\s*$/g, //非空 | ||
487 | }, | ||
488 | { | ||
489 | data:item.list[ind].tdsyjssj, | 595 | data:item.list[ind].tdsyjssj, |
490 | name:'土地使用结束时间', | 596 | name:'土地使用结束时间', |
491 | dom:this.$refs.tdsyjssj[temp+ind], | 597 | dom:this.$refs.tdsyjssj[temp+ind], |
... | @@ -496,6 +602,17 @@ export default { | ... | @@ -496,6 +602,17 @@ export default { |
496 | if (ind == item.list.length-1) { | 602 | if (ind == item.list.length-1) { |
497 | temp += item.list.length; | 603 | temp += item.list.length; |
498 | } | 604 | } |
605 | if(this.hasSyqx){ | ||
606 | rules.push( | ||
607 | { | ||
608 | data:item.list[ind].syqx, | ||
609 | name:'使用期限', | ||
610 | dom:this.$refs.syqx[temp+ind], | ||
611 | // val:this.$refs.syqx[temp+ind].value, | ||
612 | rule: /^\s*$/g, //非空 | ||
613 | } | ||
614 | ) | ||
615 | } | ||
499 | }) | 616 | }) |
500 | }) | 617 | }) |
501 | this.rulesResult = true; | 618 | this.rulesResult = true; |
... | @@ -503,8 +620,10 @@ export default { | ... | @@ -503,8 +620,10 @@ export default { |
503 | if(item.rule.test(item.data) || item.data == null){ | 620 | if(item.rule.test(item.data) || item.data == null){ |
504 | if(item.dom.$el){ | 621 | if(item.dom.$el){ |
505 | item.dom.$el.style.border = '1px solid red'; | 622 | item.dom.$el.style.border = '1px solid red'; |
623 | item.dom.$el.style.boxSizing = 'border-box'; | ||
506 | }else{ | 624 | }else{ |
507 | item.dom.style.border = '1px solid red'; | 625 | item.dom.style.border = '1px solid red'; |
626 | item.dom.style.boxSizing = 'border-box'; | ||
508 | } | 627 | } |
509 | // this.$message({ | 628 | // this.$message({ |
510 | // // message: item.name+'不能为空', | 629 | // // message: item.name+'不能为空', |
... | @@ -526,12 +645,14 @@ export default { | ... | @@ -526,12 +645,14 @@ export default { |
526 | e.$el.style.border="" | 645 | e.$el.style.border="" |
527 | }else{ | 646 | }else{ |
528 | e.$el.style.border="1px solid red" | 647 | e.$el.style.border="1px solid red" |
648 | e.$el.style.boxSizing = 'border-box'; | ||
529 | } | 649 | } |
530 | }else{ | 650 | }else{ |
531 | if(e.target.value!=''){ | 651 | if(e.target.value!=''){ |
532 | e.target.style.border="" | 652 | e.target.style.border="" |
533 | }else{ | 653 | }else{ |
534 | e.target.style.border="1px solid red" | 654 | e.target.style.border="1px solid red" |
655 | e.target.style.boxSizing = 'border-box'; | ||
535 | } | 656 | } |
536 | } | 657 | } |
537 | }, | 658 | }, | ... | ... |
... | @@ -101,9 +101,11 @@ | ... | @@ -101,9 +101,11 @@ |
101 | <li> | 101 | <li> |
102 | <el-date-picker | 102 | <el-date-picker |
103 | v-model="childItem.tdsyqssj" | 103 | v-model="childItem.tdsyqssj" |
104 | :picker-options="childItem.pickerStart" | ||
104 | type="date" | 105 | type="date" |
105 | value-format="yyyy-MM-dd" | 106 | value-format="yyyy-MM-dd" |
106 | placeholder="选择日期" | 107 | placeholder="选择日期" |
108 | @input="startTime(index,childIndex)" | ||
107 | > | 109 | > |
108 | </el-date-picker> | 110 | </el-date-picker> |
109 | </li> | 111 | </li> |
... | @@ -148,7 +150,9 @@ | ... | @@ -148,7 +150,9 @@ |
148 | v-model="childItem.tdsyjssj" | 150 | v-model="childItem.tdsyjssj" |
149 | type="date" | 151 | type="date" |
150 | value-format="yyyy-MM-dd" | 152 | value-format="yyyy-MM-dd" |
153 | :picker-options="childItem.pickerEnd" | ||
151 | placeholder="选择日期" | 154 | placeholder="选择日期" |
155 | @input="endTime(index,childIndex)" | ||
152 | > | 156 | > |
153 | </el-date-picker> | 157 | </el-date-picker> |
154 | </li> | 158 | </li> |
... | @@ -221,6 +225,8 @@ export default { | ... | @@ -221,6 +225,8 @@ export default { |
221 | syqx: "", | 225 | syqx: "", |
222 | tdsyjssj: "", | 226 | tdsyjssj: "", |
223 | tdsyqssj: "", | 227 | tdsyqssj: "", |
228 | pickerStart:{}, | ||
229 | pickerEnd:{}, | ||
224 | tdzh: "", | 230 | tdzh: "", |
225 | }, | 231 | }, |
226 | ], | 232 | ], |
... | @@ -317,6 +323,42 @@ export default { | ... | @@ -317,6 +323,42 @@ export default { |
317 | getQlxzDataList() { | 323 | getQlxzDataList() { |
318 | return this.countList; | 324 | return this.countList; |
319 | }, | 325 | }, |
326 | //起始时间判断 | ||
327 | startTime(index,childIndex){ | ||
328 | let startTime= this.countList[index].list[childIndex].tdsyqssj; | ||
329 | let endTime=this.countList[index].list[childIndex].tdsyjssj; | ||
330 | this.countList[index].list[childIndex].pickerEnd={ | ||
331 | disabledDate: (time) => { | ||
332 | if (Object.keys(startTime).length>0) { | ||
333 | return new Date(startTime).getTime()>time.getTime(); | ||
334 | }else { | ||
335 | return time.getTime()< Date.now(); | ||
336 | } | ||
337 | } | ||
338 | } | ||
339 | if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) { | ||
340 | let startYear= new Date(startTime).getFullYear(); | ||
341 | let endYear=new Date(endTime).getFullYear(); | ||
342 | } | ||
343 | }, | ||
344 | endTime(index,childIndex,e){ | ||
345 | console.log(e,'eeeeee'); | ||
346 | let startTime = this.countList[index].list[childIndex].tdsyqssj; | ||
347 | let endTime = this.countList[index].list[childIndex].tdsyjssj; | ||
348 | this.countList[index].list[childIndex].pickerStart={ | ||
349 | disabledDate: (time) => { | ||
350 | if (Object.keys(endTime).length>0) { | ||
351 | return new Date(endTime).getTime()<time.getTime(); | ||
352 | }else { | ||
353 | return time.getTime() > Date.now(); | ||
354 | } | ||
355 | } | ||
356 | } | ||
357 | if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) { | ||
358 | let startYear= new Date(startTime).getFullYear(); | ||
359 | let endYear=new Date(endTime).getFullYear(); | ||
360 | } | ||
361 | }, | ||
320 | }, | 362 | }, |
321 | }; | 363 | }; |
322 | </script> | 364 | </script> | ... | ... |
... | @@ -187,7 +187,7 @@ | ... | @@ -187,7 +187,7 @@ |
187 | 187 | ||
188 | <tr> | 188 | <tr> |
189 | <td colspan="12" rowspan="4" align="center"> | 189 | <td colspan="12" rowspan="4" align="center"> |
190 | <Qlxz ref="qlxzModule"></Qlxz> | 190 | <Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz> |
191 | </td> | 191 | </td> |
192 | </tr> | 192 | </tr> |
193 | <tr></tr> | 193 | <tr></tr> |
... | @@ -218,7 +218,7 @@ | ... | @@ -218,7 +218,7 @@ |
218 | </template> | 218 | </template> |
219 | 219 | ||
220 | <script> | 220 | <script> |
221 | import Qlxz from "./../../components/formMenu/qlxz_simple"; | 221 | import Qlxz from "./../../components/formMenu/qlxz"; |
222 | import {batchUpdateQjH} from "../../api/h"; | 222 | import {batchUpdateQjH} from "../../api/h"; |
223 | export default { | 223 | export default { |
224 | name: "plH", | 224 | name: "plH", | ... | ... |
... | @@ -3,14 +3,60 @@ | ... | @@ -3,14 +3,60 @@ |
3 | <el-dialog | 3 | <el-dialog |
4 | title="新增" | 4 | title="新增" |
5 | :visible.sync="isVisible" | 5 | :visible.sync="isVisible" |
6 | width="50%" | 6 | width="70%" |
7 | @close="close" | 7 | @close="close" |
8 | :modal-append-to-body="false" | 8 | :modal-append-to-body="false" |
9 | center> | 9 | center> |
10 | <div class="search"> | 10 | <div class="search"> |
11 | <el-button type="primary" @click="search">查询</el-button> | 11 | <!-- <el-button type="primary" @click="search">查询</el-button> |
12 | <el-button type="primary" @click="result">重置</el-button> | 12 | <el-button type="primary" @click="result">重置</el-button> --> |
13 | <el-row :gutter="10" class="shop"> | 13 | |
14 | <el-row> | ||
15 | <el-col :span="24"> | ||
16 | <el-form :inline="true" class="demo-form-inline"> | ||
17 | <el-form-item label="宗地编码"> | ||
18 | <el-input | ||
19 | v-model="queryData.zddm" | ||
20 | placeholder="输入宗地编码" | ||
21 | ></el-input> | ||
22 | </el-form-item> | ||
23 | <el-form-item label="不动产权证号"> | ||
24 | <el-input | ||
25 | v-model="queryData.bdcqzh" | ||
26 | placeholder="输入不动产权证号" | ||
27 | ></el-input> | ||
28 | </el-form-item> | ||
29 | <el-form-item label="不动产单元号"> | ||
30 | <el-input | ||
31 | maxlength="28" | ||
32 | v-model="queryData.bdcdyh" | ||
33 | placeholder="输入不动产单元号" | ||
34 | ></el-input> | ||
35 | </el-form-item> | ||
36 | <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> | ||
37 | <el-button type="warning" @click="reset">重置</el-button> | ||
38 | </el-form> | ||
39 | </el-col> | ||
40 | </el-row> | ||
41 | <el-row> | ||
42 | <el-col :span="24"> | ||
43 | <el-form :inline="true" class="demo-form-inline"> | ||
44 | <el-form-item label="权利人"> | ||
45 | <el-input | ||
46 | v-model="queryData.qlrmc" | ||
47 | placeholder="输入权利人" | ||
48 | ></el-input> | ||
49 | </el-form-item> | ||
50 | <el-form-item label="坐落"> | ||
51 | <el-input | ||
52 | v-model="queryData.zl" | ||
53 | placeholder="输入坐落" | ||
54 | ></el-input> | ||
55 | </el-form-item> | ||
56 | </el-form> | ||
57 | </el-col> | ||
58 | </el-row> | ||
59 | <!-- <el-row :gutter="10" class="shop"> | ||
14 | <el-col :span="4" class="inputtitle"> | 60 | <el-col :span="4" class="inputtitle"> |
15 | 宗地编码: | 61 | 宗地编码: |
16 | </el-col> | 62 | </el-col> |
... | @@ -23,10 +69,10 @@ | ... | @@ -23,10 +69,10 @@ |
23 | <el-col :span="8" class=""> | 69 | <el-col :span="8" class=""> |
24 | <el-input v-model="queryData.bdcqzh"></el-input> | 70 | <el-input v-model="queryData.bdcqzh"></el-input> |
25 | </el-col> | 71 | </el-col> |
26 | </el-row> | 72 | </el-row> --> |
27 | <el-row :gutter="10"> | 73 | <!-- <el-row :gutter="10"> |
28 | <el-col :span="4" class="inputtitle"> | 74 | <el-col :span="4" class="inputtitle"> |
29 | 不动产权单元号: | 75 | 不动产单元号: |
30 | </el-col> | 76 | </el-col> |
31 | <el-col :span="8"> | 77 | <el-col :span="8"> |
32 | <el-input v-model="queryData.bdcdyh"></el-input> | 78 | <el-input v-model="queryData.bdcdyh"></el-input> |
... | @@ -45,7 +91,7 @@ | ... | @@ -45,7 +91,7 @@ |
45 | <el-col :span="8"> | 91 | <el-col :span="8"> |
46 | <el-input v-model="queryData.zl"></el-input> | 92 | <el-input v-model="queryData.zl"></el-input> |
47 | </el-col> | 93 | </el-col> |
48 | </el-row> | 94 | </el-row> --> |
49 | <table border="1"> | 95 | <table border="1"> |
50 | <tr> | 96 | <tr> |
51 | <td>序号</td> | 97 | <td>序号</td> |
... | @@ -77,8 +123,6 @@ | ... | @@ -77,8 +123,6 @@ |
77 | 123 | ||
78 | </table> | 124 | </table> |
79 | </div> | 125 | </div> |
80 | <span slot="footer" class="dialog-footer"> | ||
81 | </span> | ||
82 | <div class="page"> | 126 | <div class="page"> |
83 | <el-pagination | 127 | <el-pagination |
84 | background | 128 | background |
... | @@ -146,7 +190,7 @@ | ... | @@ -146,7 +190,7 @@ |
146 | this.queryData.pageNo = val; | 190 | this.queryData.pageNo = val; |
147 | this.getData(this.queryData); | 191 | this.getData(this.queryData); |
148 | }, | 192 | }, |
149 | result: function () { | 193 | reset: function () { |
150 | this.queryData = { | 194 | this.queryData = { |
151 | bdcdyh: "", | 195 | bdcdyh: "", |
152 | bdcqzh: "", | 196 | bdcqzh: "", |
... | @@ -178,7 +222,7 @@ | ... | @@ -178,7 +222,7 @@ |
178 | }, | 222 | }, |
179 | close: function () { | 223 | close: function () { |
180 | this.$emit('close') | 224 | this.$emit('close') |
181 | this.result(); | 225 | this.reset(); |
182 | } | 226 | } |
183 | }, | 227 | }, |
184 | watch: { | 228 | watch: { |
... | @@ -197,6 +241,10 @@ | ... | @@ -197,6 +241,10 @@ |
197 | height: auto; | 241 | height: auto; |
198 | width: 80%; | 242 | width: 80%; |
199 | } | 243 | } |
244 | /deep/ .el-form-item__label{ | ||
245 | width: 96px; | ||
246 | text-align: right; | ||
247 | } | ||
200 | 248 | ||
201 | table { | 249 | table { |
202 | margin-top: 10px; | 250 | margin-top: 10px; |
... | @@ -233,5 +281,8 @@ | ... | @@ -233,5 +281,8 @@ |
233 | .noData { | 281 | .noData { |
234 | color: #b2b2b2; | 282 | color: #b2b2b2; |
235 | } | 283 | } |
284 | .page{ | ||
285 | margin-top: 20px; | ||
286 | } | ||
236 | 287 | ||
237 | </style> | 288 | </style> | ... | ... |
... | @@ -3,47 +3,54 @@ | ... | @@ -3,47 +3,54 @@ |
3 | <el-dialog | 3 | <el-dialog |
4 | title="新增" | 4 | title="新增" |
5 | :visible.sync="isVisible" | 5 | :visible.sync="isVisible" |
6 | width="50%" | 6 | width="70%" |
7 | @close="close" | 7 | @close="close" |
8 | :modal-append-to-body="false" | 8 | :modal-append-to-body="false" |
9 | center> | 9 | center> |
10 | <div class="search"> | 10 | <div class="search"> |
11 | <el-button type="primary" @click="search">查询</el-button> | 11 | <el-row> |
12 | <el-button type="primary" @click="result">重置</el-button> | 12 | <el-col :span="24"> |
13 | <el-row :gutter="10" class="shop"> | 13 | <el-form :inline="true" class="demo-form-inline"> |
14 | <el-col :span="4" class="inputtitle"> | 14 | <el-form-item label="宗地编码"> |
15 | 宗地编码: | 15 | <el-input |
16 | </el-col> | 16 | v-model="queryData.zddm" |
17 | <el-col :span="8" class=""> | 17 | placeholder="输入宗地编码" |
18 | <el-input v-model="queryData.zddm"></el-input> | 18 | ></el-input> |
19 | </el-col> | 19 | </el-form-item> |
20 | <el-col :span="4" class="inputtitle"> | 20 | <el-form-item label="不动产权证号"> |
21 | 不动产权证号: | 21 | <el-input |
22 | </el-col> | 22 | v-model="queryData.bdcqzh" |
23 | <el-col :span="8" class=""> | 23 | placeholder="输入不动产权证号" |
24 | <el-input v-model="queryData.bdcqzh"></el-input> | 24 | ></el-input> |
25 | </el-form-item> | ||
26 | <el-form-item label="不动产单元号"> | ||
27 | <el-input | ||
28 | maxlength="28" | ||
29 | v-model="queryData.bdcdyh" | ||
30 | placeholder="输入不动产单元号" | ||
31 | ></el-input> | ||
32 | </el-form-item> | ||
33 | <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> | ||
34 | <el-button type="warning" @click="reset">重置</el-button> | ||
35 | </el-form> | ||
25 | </el-col> | 36 | </el-col> |
26 | </el-row> | 37 | </el-row> |
27 | <el-row :gutter="10"> | 38 | <el-row> |
28 | <el-col :span="4" class="inputtitle"> | 39 | <el-col :span="24"> |
29 | 不动产权单元号: | 40 | <el-form :inline="true" class="demo-form-inline"> |
30 | </el-col> | 41 | <el-form-item label="权利人"> |
31 | <el-col :span="8"> | 42 | <el-input |
32 | <el-input v-model="queryData.bdcdyh"></el-input> | 43 | v-model="queryData.qlrmc" |
33 | </el-col> | 44 | placeholder="输入权利人" |
34 | <el-col :span="4" class="inputtitle"> | 45 | ></el-input> |
35 | 权利人: | 46 | </el-form-item> |
36 | </el-col> | 47 | <el-form-item label="坐落"> |
37 | <el-col :span="8"> | 48 | <el-input |
38 | <el-input v-model="queryData.qlrmc"></el-input> | 49 | v-model="queryData.zl" |
39 | </el-col> | 50 | placeholder="输入坐落" |
40 | </el-row> | 51 | ></el-input> |
41 | <el-row :gutter="10"> | 52 | </el-form-item> |
42 | <el-col :span="4" class="inputtitle"> | 53 | </el-form> |
43 | 坐落: | ||
44 | </el-col> | ||
45 | <el-col :span="8"> | ||
46 | <el-input v-model="queryData.zl"></el-input> | ||
47 | </el-col> | 54 | </el-col> |
48 | </el-row> | 55 | </el-row> |
49 | <table border="1"> | 56 | <table border="1"> |
... | @@ -77,8 +84,6 @@ | ... | @@ -77,8 +84,6 @@ |
77 | 84 | ||
78 | </table> | 85 | </table> |
79 | </div> | 86 | </div> |
80 | <span slot="footer" class="dialog-footer"> | ||
81 | </span> | ||
82 | <div class="page"> | 87 | <div class="page"> |
83 | <el-pagination | 88 | <el-pagination |
84 | background | 89 | background |
... | @@ -146,7 +151,7 @@ | ... | @@ -146,7 +151,7 @@ |
146 | this.queryData.pageNo = val; | 151 | this.queryData.pageNo = val; |
147 | this.getData(this.queryData); | 152 | this.getData(this.queryData); |
148 | }, | 153 | }, |
149 | result: function () { | 154 | reset: function () { |
150 | this.queryData = { | 155 | this.queryData = { |
151 | bdcdyh: "", | 156 | bdcdyh: "", |
152 | bdcqzh: "", | 157 | bdcqzh: "", |
... | @@ -178,7 +183,7 @@ | ... | @@ -178,7 +183,7 @@ |
178 | }, | 183 | }, |
179 | close: function () { | 184 | close: function () { |
180 | this.$emit('close') | 185 | this.$emit('close') |
181 | this.result(); | 186 | this.reset(); |
182 | } | 187 | } |
183 | }, | 188 | }, |
184 | watch: { | 189 | watch: { |
... | @@ -197,6 +202,11 @@ | ... | @@ -197,6 +202,11 @@ |
197 | height: auto; | 202 | height: auto; |
198 | width: 80%; | 203 | width: 80%; |
199 | } | 204 | } |
205 | /deep/ .el-form-item__label{ | ||
206 | width: 96px; | ||
207 | text-align: right; | ||
208 | } | ||
209 | |||
200 | 210 | ||
201 | table { | 211 | table { |
202 | margin-top: 10px; | 212 | margin-top: 10px; |
... | @@ -233,5 +243,8 @@ | ... | @@ -233,5 +243,8 @@ |
233 | .noData { | 243 | .noData { |
234 | color: #b2b2b2; | 244 | color: #b2b2b2; |
235 | } | 245 | } |
246 | .page{ | ||
247 | margin-top: 20px; | ||
248 | } | ||
236 | 249 | ||
237 | </style> | 250 | </style> | ... | ... |
... | @@ -439,7 +439,7 @@ export default { | ... | @@ -439,7 +439,7 @@ export default { |
439 | width: 100%; | 439 | width: 100%; |
440 | height: 100vh; | 440 | height: 100vh; |
441 | position: relative; | 441 | position: relative; |
442 | min-width: 1500px; | 442 | min-width: 1680px; |
443 | overflow-x: auto; | 443 | overflow-x: auto; |
444 | .calcWidth{ | 444 | .calcWidth{ |
445 | width: calc(100% - 300px); | 445 | width: calc(100% - 300px); | ... | ... |
... | @@ -141,7 +141,7 @@ | ... | @@ -141,7 +141,7 @@ |
141 | 141 | ||
142 | <tr> | 142 | <tr> |
143 | <td colspan="12" align="center"> | 143 | <td colspan="12" align="center"> |
144 | <Qlxz ref="qlxzModule" :formData="form"></Qlxz> | 144 | <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> |
145 | </td> | 145 | </td> |
146 | </tr> | 146 | </tr> |
147 | 147 | ||
... | @@ -207,7 +207,7 @@ | ... | @@ -207,7 +207,7 @@ |
207 | 207 | ||
208 | <script> | 208 | <script> |
209 | import Qlr from "../../../components/formMenu/qlr"; | 209 | import Qlr from "../../../components/formMenu/qlr"; |
210 | import Qlxz from "../../../components/formMenu/qlxz_simple"; | 210 | import Qlxz from "../../../components/formMenu/qlxz"; |
211 | import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz"; | 211 | import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz"; |
212 | import {getQjZdjbxxDetailById} from "../../../api/zd" | 212 | import {getQjZdjbxxDetailById} from "../../../api/zd" |
213 | import {submit,registerCall} from "../../../api/common" | 213 | import {submit,registerCall} from "../../../api/common" | ... | ... |
... | @@ -190,18 +190,37 @@ | ... | @@ -190,18 +190,37 @@ |
190 | <span class="tips">分割前多幢信息</span> | 190 | <span class="tips">分割前多幢信息</span> |
191 | <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> | 191 | <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> |
192 | <div class="fgq"> | 192 | <div class="fgq"> |
193 | <div class="data"> | 193 | <el-card class="data"> |
194 | <ul> | 194 | <div slot="header" class="clearfix"> |
195 | <li><span>宗地代码:</span>{{dzFgqData.zddm}}</li> | 195 | <span>多幢基本信息</span> |
196 | <li><span>不动产单元号:</span>{{dzFgqData.bdcdyh}}</li> | 196 | </div> |
197 | <li><span>项目名称:</span>{{dzFgqData.xmmc}}</li> | 197 | <ul class="zdjbxx"> |
198 | <li><span>不动产权证号:</span>{{dzFgqData.bdcqzh}}</li> | 198 | <li><span class="label">宗地代码:</span><span class="value">{{dzFgqData.zddm}}</span></li> |
199 | <li><span>权利人:</span>{{dzFgqData.qlr}}</li> | 199 | <li><span class="label">不动产单元号:</span><span class="value">{{dzFgqData.bdcdyh}}</span></li> |
200 | <li><span>坐落:</span>{{dzFgqData.zl}}</li> | 200 | <li><span class="label">项目名称:</span><span class="value">{{dzFgqData.xmmc}}</span></li> |
201 | <li><span class="label">不动产权证号:</span><span class="value">{{dzFgqData.bdcqzh}}</span></li> | ||
202 | <li><span class="label">权利人:</span><span class="value">{{dzFgqData.qlr}}</span></li> | ||
203 | <li><span class="label">坐落:</span><span class="value">{{dzFgqData.zl}}</span></li> | ||
201 | </ul> | 204 | </ul> |
205 | <div class="zdmap"> | ||
206 | |||
202 | </div> | 207 | </div> |
208 | </el-card> | ||
203 | <div class="zxx"> | 209 | <div class="zxx"> |
204 | <div class="dz"> | 210 | <el-card class="zrz"> |
211 | <div slot="header" class="clearfix"> | ||
212 | <span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{zdZxx.zrzList.length}}</span>幢</span> | ||
213 | </div> | ||
214 | <ul> | ||
215 | <li v-for="(item,index) in zdZxx.zrzList" :key="index+item.xmmc" | ||
216 | :class="tempBsmList.indexOf(item.bsm) > -1 ? 'hasChoosed':''" | ||
217 | > | ||
218 | <i class="iconfont iconziranchuang"></i> {{item.displays}} | ||
219 | </li> | ||
220 | </ul> | ||
221 | </el-card> | ||
222 | |||
223 | <!-- <div class="dz"> | ||
205 | <div class="title"> | 224 | <div class="title"> |
206 | <span>多幢信息({{zdZxx.zrzList.length}}个)</span> | 225 | <span>多幢信息({{zdZxx.zrzList.length}}个)</span> |
207 | </div> | 226 | </div> |
... | @@ -218,14 +237,21 @@ | ... | @@ -218,14 +237,21 @@ |
218 | :class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}} | 237 | :class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}} |
219 | </li> | 238 | </li> |
220 | </ul> | 239 | </ul> |
221 | </div> | 240 | </div> --> |
222 | </div> | 241 | </div> |
223 | </div> | 242 | </div> |
224 | <div class="fgh"> | 243 | <div class="fgh"> |
225 | <span class="tips">分割后多幢信息</span> | 244 | <span class="tips">分割后多幢信息</span> |
226 | <table border="1"> | 245 | <table border="1"> |
227 | <tr> | 246 | <tr> |
228 | <th class="cz">操作</th> | 247 | <th class="cz"> |
248 | <el-button | ||
249 | type="primary" | ||
250 | class="changeBtn outAdd addMinus" | ||
251 | @click="addRow" | ||
252 | >+ | ||
253 | </el-button> | ||
254 | </th> | ||
229 | <th class="xzq">行政区</th> | 255 | <th class="xzq">行政区</th> |
230 | <th class="djq">地籍区</th> | 256 | <th class="djq">地籍区</th> |
231 | <th class="djzq">地籍子区</th> | 257 | <th class="djzq">地籍子区</th> |
... | @@ -297,22 +323,6 @@ | ... | @@ -297,22 +323,6 @@ |
297 | <input type="text" v-model="item.xmmc" class="formInput"/> | 323 | <input type="text" v-model="item.xmmc" class="formInput"/> |
298 | </td> | 324 | </td> |
299 | </tr> | 325 | </tr> |
300 | <tr> | ||
301 | <td> | ||
302 | <el-button | ||
303 | type="primary" | ||
304 | class="changeBtn outAdd addMinus" | ||
305 | @click="addRow" | ||
306 | >+ | ||
307 | </el-button> | ||
308 | </td> | ||
309 | <td></td> | ||
310 | <td></td> | ||
311 | <td></td> | ||
312 | <td></td> | ||
313 | <td></td> | ||
314 | <td></td> | ||
315 | </tr> | ||
316 | </table> | 326 | </table> |
317 | </div> | 327 | </div> |
318 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" | 328 | <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" |
... | @@ -714,6 +724,7 @@ | ... | @@ -714,6 +724,7 @@ |
714 | } | 724 | } |
715 | }, | 725 | }, |
716 | saveZd() { | 726 | saveZd() { |
727 | if(this.tempBsmList.length == (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ | ||
717 | zdfg(this.zdFghData).then(res => { | 728 | zdfg(this.zdFghData).then(res => { |
718 | if (res.success) { | 729 | if (res.success) { |
719 | this.$store.state.zdbsms = res.result; | 730 | this.$store.state.zdbsms = res.result; |
... | @@ -728,6 +739,9 @@ | ... | @@ -728,6 +739,9 @@ |
728 | Message.error("保存失败") | 739 | Message.error("保存失败") |
729 | } | 740 | } |
730 | }) | 741 | }) |
742 | }else{ | ||
743 | this.$message.warning("幢信息未选择完成,无法保存") | ||
744 | } | ||
731 | }, | 745 | }, |
732 | saveDz() { | 746 | saveDz() { |
733 | 747 | ... | ... |
... | @@ -301,7 +301,7 @@ | ... | @@ -301,7 +301,7 @@ |
301 | </tr> | 301 | </tr> |
302 | <tr> | 302 | <tr> |
303 | <td colspan="12"> | 303 | <td colspan="12"> |
304 | <Qlxz ref="qlxzModule" :formData="formData"></Qlxz> | 304 | <Qlxz ref="qlxzModule" :hasSyqx='true' :formData="formData"></Qlxz> |
305 | </td> | 305 | </td> |
306 | </tr> | 306 | </tr> |
307 | <tr> | 307 | <tr> |
... | @@ -479,9 +479,9 @@ export default { | ... | @@ -479,9 +479,9 @@ export default { |
479 | console.log(res.result,'res.result'); | 479 | console.log(res.result,'res.result'); |
480 | this.getXzqData(res.result.xzqbsm,res.result.djqbsm); | 480 | this.getXzqData(res.result.xzqbsm,res.result.djqbsm); |
481 | //如果没有宗地代码,自动生成 | 481 | //如果没有宗地代码,自动生成 |
482 | if(res.result.zddm == null){ | 482 | // if(res.result.zddm == null){ |
483 | this.generatorCode() | 483 | // this.generatorCode() |
484 | } | 484 | // } |
485 | //判断容密高是否为区间值,如果是区间值,则将校验值置为'-'并给rjl,jzmd,jzxg赋值 | 485 | //判断容密高是否为区间值,如果是区间值,则将校验值置为'-'并给rjl,jzmd,jzxg赋值 |
486 | this.rjl = this.isInterval(this.formData.jyrjl) ? this.formData.jyrjl : ''; | 486 | this.rjl = this.isInterval(this.formData.jyrjl) ? this.formData.jyrjl : ''; |
487 | this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? '-' : this.formData.jyrjl; | 487 | this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? '-' : this.formData.jyrjl; |
... | @@ -702,8 +702,10 @@ export default { | ... | @@ -702,8 +702,10 @@ export default { |
702 | if(item.rule.test(item.data) || item.data == null){ | 702 | if(item.rule.test(item.data) || item.data == null){ |
703 | if(item.dom.$el){ | 703 | if(item.dom.$el){ |
704 | item.dom.$el.style.border = '1px solid red'; | 704 | item.dom.$el.style.border = '1px solid red'; |
705 | item.dom.$el.style.boxSizing = 'border-box'; | ||
705 | }else{ | 706 | }else{ |
706 | item.dom.style.border = '1px solid red'; | 707 | item.dom.style.border = '1px solid red'; |
708 | item.dom.style.boxSizing = 'border-box'; | ||
707 | } | 709 | } |
708 | // this.$message({ | 710 | // this.$message({ |
709 | // // message: item.name+'不能为空', | 711 | // // message: item.name+'不能为空', |
... | @@ -717,7 +719,8 @@ export default { | ... | @@ -717,7 +719,8 @@ export default { |
717 | this.$nextTick(()=>{ | 719 | this.$nextTick(()=>{ |
718 | if(flag){ | 720 | if(flag){ |
719 | //宗地面积处理 | 721 | //宗地面积处理 |
720 | this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'') | 722 | // console.log(this.formData.zdmj,'this.formData.zdmj'); |
723 | // this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'') | ||
721 | updateQjZdjbxx(this.formData) | 724 | updateQjZdjbxx(this.formData) |
722 | .then((res) => { | 725 | .then((res) => { |
723 | if (res.code == 200) { | 726 | if (res.code == 200) { |
... | @@ -774,7 +777,8 @@ export default { | ... | @@ -774,7 +777,8 @@ export default { |
774 | if(e.target.value!=''){ | 777 | if(e.target.value!=''){ |
775 | e.target.style.border="" | 778 | e.target.style.border="" |
776 | }else{ | 779 | }else{ |
777 | e.target.style.border="1px solid red" | 780 | e.target.style.border="1px solid red"; |
781 | e.target.style.boxSizing = 'border-box'; | ||
778 | } | 782 | } |
779 | }, | 783 | }, |
780 | //提交宗地基本信息 | 784 | //提交宗地基本信息 | ... | ... |
... | @@ -310,7 +310,7 @@ | ... | @@ -310,7 +310,7 @@ |
310 | 310 | ||
311 | <tr> | 311 | <tr> |
312 | <td colspan="12" rowspan="4" align="center"> | 312 | <td colspan="12" rowspan="4" align="center"> |
313 | <Qlxz ref="qlxzModule"></Qlxz> | 313 | <Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz> |
314 | </td> | 314 | </td> |
315 | </tr> | 315 | </tr> |
316 | <tr></tr> | 316 | <tr></tr> |
... | @@ -403,7 +403,7 @@ | ... | @@ -403,7 +403,7 @@ |
403 | 403 | ||
404 | <script> | 404 | <script> |
405 | import Qlr from "./../../../../../components/formMenu/qlr"; | 405 | import Qlr from "./../../../../../components/formMenu/qlr"; |
406 | import Qlxz from "./../../../../../components/formMenu/qlxz_simple"; | 406 | import Qlxz from "./../../../../../components/formMenu/qlxz"; |
407 | import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"; | 407 | import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"; |
408 | import {getBdcdyh} from "./../../../../../api/zrz"; | 408 | import {getBdcdyh} from "./../../../../../api/zrz"; |
409 | import {submit,registerCall} from "./../../../../../api/common" | 409 | import {submit,registerCall} from "./../../../../../api/common" | ... | ... |
... | @@ -14,18 +14,18 @@ | ... | @@ -14,18 +14,18 @@ |
14 | </td> | 14 | </td> |
15 | <td colspan="2" >自然幢号<i class="requisite">*</i></td> | 15 | <td colspan="2" >自然幢号<i class="requisite">*</i></td> |
16 | <td colspan="4" class="psr"> | 16 | <td colspan="4" class="psr"> |
17 | <input class="formInput percent80" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh"> | 17 | <input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh"> |
18 | <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button> | 18 | <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button> |
19 | </td> | 19 | </td> |
20 | </tr> | 20 | </tr> |
21 | <tr> | 21 | <tr> |
22 | <td colspan="2" >项目名称<i class="requisite">*</i></td> | 22 | <td colspan="2" >项目名称<i class="requisite">*</i></td> |
23 | <td colspan="4" > | 23 | <td colspan="4" > |
24 | <input class="formInput " :disabled="form.qszt!='0'" v-model="form.xmmc"> | 24 | <input class="formInput " ref="xmmc" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.xmmc"> |
25 | </td> | 25 | </td> |
26 | <td colspan="2" >不动产单元号<i class="requisite">*</i></td> | 26 | <td colspan="2" >不动产单元号<i class="requisite">*</i></td> |
27 | <td colspan="4"> | 27 | <td colspan="4"> |
28 | <input class="formInput " :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh"> | 28 | <input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh"> |
29 | </td> | 29 | </td> |
30 | </tr> | 30 | </tr> |
31 | 31 | ||
... | @@ -43,7 +43,7 @@ | ... | @@ -43,7 +43,7 @@ |
43 | <tr> | 43 | <tr> |
44 | <td colspan="2" >房屋性质<i class="requisite">*</i></td> | 44 | <td colspan="2" >房屋性质<i class="requisite">*</i></td> |
45 | <td colspan="4" > | 45 | <td colspan="4" > |
46 | <el-select class="formSelect" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" > | 46 | <el-select class="formSelect" ref="fwxz" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" > |
47 | <el-option | 47 | <el-option |
48 | v-for="item in $store.state.fwxzOptions" | 48 | v-for="item in $store.state.fwxzOptions" |
49 | :key="item.bsm" | 49 | :key="item.bsm" |
... | @@ -119,7 +119,7 @@ | ... | @@ -119,7 +119,7 @@ |
119 | </tr> | 119 | </tr> |
120 | 120 | ||
121 | <tr> | 121 | <tr> |
122 | <td colspan="2" >产别<i class="requisite">*</i></td> | 122 | <td colspan="2" >产别</td> |
123 | <td colspan="4" > | 123 | <td colspan="4" > |
124 | <el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" > | 124 | <el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" > |
125 | <el-option | 125 | <el-option |
... | @@ -130,7 +130,7 @@ | ... | @@ -130,7 +130,7 @@ |
130 | </el-option> | 130 | </el-option> |
131 | </el-select> | 131 | </el-select> |
132 | </td> | 132 | </td> |
133 | <td colspan="2" >产权来源<i class="requisite">*</i></td> | 133 | <td colspan="2" >产权来源</td> |
134 | <td colspan="4" > | 134 | <td colspan="4" > |
135 | <el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" > | 135 | <el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" > |
136 | <el-option | 136 | <el-option |
... | @@ -155,6 +155,8 @@ | ... | @@ -155,6 +155,8 @@ |
155 | </td> | 155 | </td> |
156 | <td colspan="3" > | 156 | <td colspan="3" > |
157 | <el-select-tree style="width:100%" | 157 | <el-select-tree style="width:100%" |
158 | ref="ghyt" | ||
159 | @blur="inputBlur($event)" | ||
158 | v-if="show" | 160 | v-if="show" |
159 | :default-expand-all="defaultExpandAll" | 161 | :default-expand-all="defaultExpandAll" |
160 | :multiple="multiple" | 162 | :multiple="multiple" |
... | @@ -170,6 +172,8 @@ | ... | @@ -170,6 +172,8 @@ |
170 | <td colspan="2" >用途</td> | 172 | <td colspan="2" >用途</td> |
171 | <td colspan="4" > | 173 | <td colspan="4" > |
172 | <el-select-tree style="width:100%" | 174 | <el-select-tree style="width:100%" |
175 | ref="yt" | ||
176 | @blur="inputBlur($event)" | ||
173 | v-if="show" | 177 | v-if="show" |
174 | :default-expand-all="defaultExpandAll" | 178 | :default-expand-all="defaultExpandAll" |
175 | :multiple="multiple" | 179 | :multiple="multiple" |
... | @@ -194,7 +198,7 @@ | ... | @@ -194,7 +198,7 @@ |
194 | <span> 删除</span> | 198 | <span> 删除</span> |
195 | </td> | 199 | </td> |
196 | <td colspan="9" > | 200 | <td colspan="9" > |
197 | <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > | 201 | <el-select class="persent78" ref="fwjg" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > |
198 | <el-option | 202 | <el-option |
199 | v-for="item in $store.state.jgOptions" | 203 | v-for="item in $store.state.jgOptions" |
200 | :key="item.bsm" | 204 | :key="item.bsm" |
... | @@ -207,7 +211,7 @@ | ... | @@ -207,7 +211,7 @@ |
207 | 211 | ||
208 | <tr> | 212 | <tr> |
209 | <td colspan="12" align="center"> | 213 | <td colspan="12" align="center"> |
210 | <Qlxz ref="qlxzModule" :formData="form"></Qlxz> | 214 | <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> |
211 | </td> | 215 | </td> |
212 | </tr> | 216 | </tr> |
213 | 217 | ||
... | @@ -216,7 +220,7 @@ | ... | @@ -216,7 +220,7 @@ |
216 | <span>坐落<i class="requisite">*</i></span> | 220 | <span>坐落<i class="requisite">*</i></span> |
217 | </td> | 221 | </td> |
218 | <td colspan="10" > | 222 | <td colspan="10" > |
219 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zl"> | 223 | <input class="formInput" ref="zl" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.zl"> |
220 | </td> | 224 | </td> |
221 | </tr> | 225 | </tr> |
222 | 226 | ||
... | @@ -273,7 +277,7 @@ | ... | @@ -273,7 +277,7 @@ |
273 | 277 | ||
274 | <script> | 278 | <script> |
275 | import Qlr from "../../../components/formMenu/qlr"; | 279 | import Qlr from "../../../components/formMenu/qlr"; |
276 | import Qlxz from "../../../components/formMenu/qlxz_simple"; | 280 | import Qlxz from "../../../components/formMenu/qlxz"; |
277 | import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" | 281 | import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" |
278 | import {getQjZdjbxxDetailById} from "../../../api/zd" | 282 | import {getQjZdjbxxDetailById} from "../../../api/zd" |
279 | import {submit,registerCall} from "../../../api/common" | 283 | import {submit,registerCall} from "../../../api/common" |
... | @@ -392,7 +396,8 @@ | ... | @@ -392,7 +396,8 @@ |
392 | DJZQDM:"", | 396 | DJZQDM:"", |
393 | ZDTZM:"", | 397 | ZDTZM:"", |
394 | BSM:"", | 398 | BSM:"", |
395 | } | 399 | }, |
400 | rules:[], | ||
396 | } | 401 | } |
397 | }, | 402 | }, |
398 | methods: { | 403 | methods: { |
... | @@ -450,16 +455,92 @@ | ... | @@ -450,16 +455,92 @@ |
450 | onSave(){ | 455 | onSave(){ |
451 | //判断自然幢号和不动产单元号是否手动修改过(自然幢号和不动产单元号的前19位是否和宗地代码一致) | 456 | //判断自然幢号和不动产单元号是否手动修改过(自然幢号和不动产单元号的前19位是否和宗地代码一致) |
452 | console.log(this.form,'this.form'); | 457 | console.log(this.form,'this.form'); |
458 | //给校验项赋值 | ||
459 | this.rules=[ | ||
460 | { | ||
461 | data:this.form.zrzh, | ||
462 | name:'自然幢号', | ||
463 | dom:this.$refs.zrzh, | ||
464 | rule: /^\s*$/g, //非空 | ||
465 | }, | ||
466 | { | ||
467 | data:this.form.bdcdyh, | ||
468 | name:'不动产单元号', | ||
469 | dom:this.$refs.bdcdyh, | ||
470 | rule: /^\s*$/g, //非空 | ||
471 | }, | ||
472 | { | ||
473 | data:this.form.xmmc, | ||
474 | name:'项目名称', | ||
475 | dom:this.$refs.xmmc, | ||
476 | rule: /^\s*$/g, //非空 | ||
477 | }, | ||
478 | { | ||
479 | data:this.form.fwxzbsm, | ||
480 | name:'房屋性质', | ||
481 | dom:this.$refs.fwxz, | ||
482 | rule: /^\s*$/g, //非空 | ||
483 | }, | ||
484 | { | ||
485 | data:this.form.zl, | ||
486 | name:'坐落', | ||
487 | dom:this.$refs.zl, | ||
488 | rule: /^\s*$/g, //非空 | ||
489 | }, | ||
490 | ] | ||
491 | this.form.fwytList.forEach((item,index)=>{ | ||
492 | this.rules.push( | ||
493 | { | ||
494 | data:this.form.fwytList[index].ghyt, | ||
495 | name:'规划用途', | ||
496 | dom:this.$refs.ghyt[index], | ||
497 | rule: /^\s*$/g, //非空 | ||
498 | }, | ||
499 | { | ||
500 | data:this.form.fwytList[index].yt, | ||
501 | name:'用途', | ||
502 | dom:this.$refs.yt[index], | ||
503 | rule: /^\s*$/g, //非空 | ||
504 | }, | ||
505 | ) | ||
506 | }) | ||
507 | this.form.fwjgList.forEach((item,index)=>{ | ||
508 | this.rules.push( | ||
509 | { | ||
510 | data:this.form.fwjgList[index].fwjg, | ||
511 | name:'房屋结构', | ||
512 | dom:this.$refs.fwjg[index], | ||
513 | rule: /^\s*$/g, //非空 | ||
514 | }, | ||
515 | ) | ||
516 | }) | ||
517 | this.loading=true; | ||
518 | this.form.zrzbsm=this.bsm; | ||
519 | this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); | ||
520 | this.$refs.qlxzModule.getRules(); | ||
521 | let flag = true; | ||
522 | console.log(this.rules,'this.rules'); | ||
523 | this.rules.forEach(item=>{ | ||
524 | if(item.rule.test(item.data) || item.data == null){ | ||
525 | if(item.dom.$el){ | ||
526 | item.dom.$el.style.border = '1px solid red'; | ||
527 | item.dom.$el.style.boxSizing = 'border-box'; | ||
528 | }else{ | ||
529 | item.dom.style.border = '1px solid red'; | ||
530 | item.dom.style.boxSizing = 'border-box'; | ||
531 | } | ||
532 | flag = false; | ||
533 | return false | ||
534 | } | ||
535 | }) | ||
536 | this.$nextTick(()=>{ | ||
537 | if (flag) { | ||
453 | if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){ | 538 | if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){ |
454 | this.$message({ | 539 | this.$message({ |
455 | message: '自然幢号或不动产单元号有误,请核对后再试一次', | 540 | message: '自然幢号或不动产单元号有误,请核对后再试一次', |
456 | type: "warning", | 541 | type: "warning", |
457 | }); | 542 | }); |
458 | }else{ | 543 | }else{ |
459 | this.loading=true; | ||
460 | this.form.zrzbsm=this.bsm; | ||
461 | this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); | ||
462 | if(1>0){ | ||
463 | saveZrzInfo(this.form).then((res)=>{ | 544 | saveZrzInfo(this.form).then((res)=>{ |
464 | if(res.code===200){ | 545 | if(res.code===200){ |
465 | this.$message.success("保存完成!") | 546 | this.$message.success("保存完成!") |
... | @@ -472,7 +553,6 @@ | ... | @@ -472,7 +553,6 @@ |
472 | this.loading=false; | 553 | this.loading=false; |
473 | }) | 554 | }) |
474 | this.loading=false; | 555 | this.loading=false; |
475 | } | ||
476 | 556 | ||
477 | //保存到空间库里面 | 557 | //保存到空间库里面 |
478 | var self = this; | 558 | var self = this; |
... | @@ -488,7 +568,14 @@ | ... | @@ -488,7 +568,14 @@ |
488 | console.log("属性保存完成!!"); | 568 | console.log("属性保存完成!!"); |
489 | }); | 569 | }); |
490 | } | 570 | } |
491 | 571 | }else{ | |
572 | this.$message({ | ||
573 | // message: item.name+'不能为空', | ||
574 | message: '请完善表单后再继续操作', | ||
575 | type: "warning", | ||
576 | }); | ||
577 | } | ||
578 | }) | ||
492 | }, | 579 | }, |
493 | onSubmit(){ | 580 | onSubmit(){ |
494 | let data={ | 581 | let data={ |
... | @@ -526,6 +613,7 @@ | ... | @@ -526,6 +613,7 @@ |
526 | }); | 613 | }); |
527 | }, | 614 | }, |
528 | generatorCode(){ | 615 | generatorCode(){ |
616 | console.log(this.form,'this.form'); | ||
529 | if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){ | 617 | if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){ |
530 | this.open(); | 618 | this.open(); |
531 | return; | 619 | return; |
... | @@ -555,6 +643,10 @@ | ... | @@ -555,6 +643,10 @@ |
555 | getZrzDetailByBsm(data).then((res)=>{ | 643 | getZrzDetailByBsm(data).then((res)=>{ |
556 | if(res.code===200){ | 644 | if(res.code===200){ |
557 | this.form=res.result; | 645 | this.form=res.result; |
646 | // //如果没有宗地代码,自动生成 | ||
647 | // if(res.result.zddm == null){ | ||
648 | // this.generatorCode() | ||
649 | // } | ||
558 | this.$store.state.zrzh = res.result.zrzh; | 650 | this.$store.state.zrzh = res.result.zrzh; |
559 | if(this.form.fwjgList.length===0){ | 651 | if(this.form.fwjgList.length===0){ |
560 | this.form.fwjgList.push({ | 652 | this.form.fwjgList.push({ |
... | @@ -595,10 +687,19 @@ | ... | @@ -595,10 +687,19 @@ |
595 | } | 687 | } |
596 | //权利性质数据传给子组件 | 688 | //权利性质数据传给子组件 |
597 | this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS | 689 | this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS |
690 | |||
598 | } | 691 | } |
599 | } | 692 | } |
600 | }) | 693 | }) |
601 | }, | 694 | }, |
695 | inputBlur(e){ | ||
696 | if(e.target.value!=''){ | ||
697 | e.target.style.border="" | ||
698 | }else{ | ||
699 | e.target.style.border="1px solid red"; | ||
700 | e.target.style.boxSizing = 'border-box'; | ||
701 | } | ||
702 | }, | ||
602 | }, | 703 | }, |
603 | created(){ | 704 | created(){ |
604 | //todo 怎么判断进入到该页面是从新建处进来的,还是从右键宗地进来的!如果是从新建进来的就需要把虚拟宗标识码带过来; | 705 | //todo 怎么判断进入到该页面是从新建处进来的,还是从右键宗地进来的!如果是从新建进来的就需要把虚拟宗标识码带过来; | ... | ... |
-
Please register or sign in to post a comment