自然幢表单验证及权利人组件修改
Showing
7 changed files
with
54 additions
and
11 deletions
This diff is collapsed.
Click to expand it.
... | @@ -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", | ... | ... |
... | @@ -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" | ... | ... |
... | @@ -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; |
... | @@ -717,7 +717,8 @@ export default { | ... | @@ -717,7 +717,8 @@ export default { |
717 | this.$nextTick(()=>{ | 717 | this.$nextTick(()=>{ |
718 | if(flag){ | 718 | if(flag){ |
719 | //宗地面积处理 | 719 | //宗地面积处理 |
720 | this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'') | 720 | // console.log(this.formData.zdmj,'this.formData.zdmj'); |
721 | // this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'') | ||
721 | updateQjZdjbxx(this.formData) | 722 | updateQjZdjbxx(this.formData) |
722 | .then((res) => { | 723 | .then((res) => { |
723 | if (res.code == 200) { | 724 | if (res.code == 200) { | ... | ... |
... | @@ -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" | ... | ... |
This diff is collapsed.
Click to expand it.
-
Please register or sign in to post a comment