6ffa52b0 by 杨威

自然幢表单验证及权利人组件修改

1 parent 84cf8218
...@@ -51,184 +51,294 @@ ...@@ -51,184 +51,294 @@
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>
56 <el-col 55 <template v-if="hasSyqx">
57 :span="3" 56 <el-col
58 :key="childIndex + '7'" 57 :span="3"
59 :class="childIndex > 0 ? 'childYT' : ''" 58 :key="childIndex + '7'"
60 > 59 :class="childIndex > 0 ? 'childYT' : ''"
61 <ul> 60 >
62 <li>批准用途</li> 61 <ul>
63 <li>实际用途</li> 62 <li>批准用途</li>
64 <li>土地使用起始时间<i class="requisite">*</i></li> 63 <li>实际用途</li>
65 </ul> 64 <li>土地使用起始时间<i class="requisite">*</i></li>
66 </el-col> 65 </ul>
67 <el-col 66 </el-col>
68 :span="4" 67 <el-col
69 :key="childIndex + '6'" 68 :span="4"
70 :class="childIndex > 0 ? 'childYT' : ''" 69 :key="childIndex + '6'"
71 > 70 :class="childIndex > 0 ? 'childYT' : ''"
72 <ul> 71 >
73 <li> 72 <ul>
74 <el-select-tree 73 <li>
75 class="formSelect percent30" 74 <el-select-tree
76 v-if="show" 75 class="formSelect percent30"
77 :default-expand-all="defaultExpandAll" 76 v-if="show"
78 :multiple="multiple" 77 :default-expand-all="defaultExpandAll"
79 :placeholder="placeholder" 78 :multiple="multiple"
80 :disabled="formData.qszt!='0'" 79 :placeholder="placeholder"
81 :data="$store.state.tdytList" 80 :disabled="formData.qszt!='0'"
82 :props="treeProps" 81 :data="$store.state.tdytList"
83 :check-strictly="checkStrictly" 82 :props="treeProps"
84 :clearable="clearable" 83 :check-strictly="checkStrictly"
85 v-model="childItem.pzytdm" 84 :clearable="clearable"
86 ></el-select-tree> 85 v-model="childItem.pzytdm"
87 </li> 86 ></el-select-tree>
88 <li> 87 </li>
89 <el-select-tree 88 <li>
90 class="formSelect percent30" 89 <el-select-tree
91 v-if="show" 90 class="formSelect percent30"
92 :default-expand-all="defaultExpandAll" 91 v-if="show"
93 :multiple="multiple" 92 :default-expand-all="defaultExpandAll"
94 :placeholder="placeholder" 93 :multiple="multiple"
95 :disabled="formData.qszt!='0'" 94 :placeholder="placeholder"
96 :data="$store.state.tdytList" 95 :disabled="formData.qszt!='0'"
97 :props="treeProps" 96 :data="$store.state.tdytList"
98 :check-strictly="checkStrictly" 97 :props="treeProps"
99 :clearable="clearable" 98 :check-strictly="checkStrictly"
100 v-model="childItem.sjytdm" 99 :clearable="clearable"
101 ></el-select-tree> 100 v-model="childItem.sjytdm"
102 </li> 101 ></el-select-tree>
103 <li> 102 </li>
104 <el-date-picker 103 <li>
105 :disabled="formData.qszt!='0'" 104 <el-date-picker
106 v-model="childItem.tdsyqssj" 105 :disabled="formData.qszt!='0'"
107 type="date" 106 v-model="childItem.tdsyqssj"
108 ref="tdsyqssj" 107 type="date"
109 :picker-options="childItem.pickerStart" 108 ref="tdsyqssj"
110 value-format="yyyy-MM-dd" 109 :picker-options="childItem.pickerStart"
111 placeholder="选择日期" 110 value-format="yyyy-MM-dd"
112 @blur="inputBlur($event,true)" 111 placeholder="选择日期"
113 @input="startTime(index,childIndex)" 112 @blur="inputBlur($event,true)"
114 > 113 @input="startTime(index,childIndex)"
115 </el-date-picker>
116 </li>
117 </ul>
118 </el-col>
119 <el-col
120 :span="3"
121 :key="childIndex + '5'"
122 :class="childIndex > 0 ? 'childYT' : ''"
123 >
124 <ul>
125 <li>地类编码</li>
126 <li>地类编码</li>
127 <li>年限<i class="requisite">*</i></li>
128 </ul>
129 </el-col>
130 <el-col
131 :span="3"
132 :key="childIndex + '4'"
133 :class="childIndex > 0 ? 'childYT' : ''"
134 >
135 <ul>
136 <li>
137 <input
138 type="text"
139 style="top: -1px;"
140 :disabled="formData.qszt!='0'"
141 v-model="childItem.pzytdm"
142 class="formInput"
143 />
144 </li>
145 <li>
146 <input
147 type="text"
148 :disabled="formData.qszt!='0'"
149 v-model="childItem.sjytdm"
150 class="formInput"
151 />
152 </li>
153 <li>
154 <input
155 type="text"
156 ref="syqx"
157 @blur="inputBlur($event,false)"
158 maxlength="3"
159 onkeyup="value=value.replace(/[^\d]/g,'')"
160 @input="sumTime(index,childIndex,childItem.syqx,childItem.syqx)"
161 :disabled="formData.qszt!='0'"
162 v-model="childItem.syqx"
163 class="formInput"
164 />
165 </li>
166 </ul>
167 </el-col>
168 <el-col
169 :span="3"
170 :key="childIndex + '2'"
171 :class="childIndex > 0 ? 'childYT' : ''"
172 >
173 <ul>
174 <li>等级</li>
175 <li>等级</li>
176 <li>土地使用结束时间<i class="requisite">*</i></li>
177 </ul>
178 </el-col>
179 <el-col
180 :span="4"
181 :key="childIndex + '3'"
182 class="noRightBorder"
183 :class="childIndex > 0 ? 'childYT ' : ''"
184 >
185 <ul>
186 <li>
187 <el-select
188 :disabled="formData.qszt!='0'"
189 class="formSelect percent30"
190 v-model="childItem.pzdjbsm"
191 >
192 <el-option
193 v-for="item in $store.state.tddjList"
194 :key="item.bsm"
195 :label="item.mc"
196 :value="item.bsm"
197 > 114 >
198 </el-option> 115 </el-date-picker>
199 </el-select> 116 </li>
200 </li> 117 </ul>
201 <li> 118 </el-col>
202 <el-select 119 <el-col
203 :disabled="formData.qszt!='0'" 120 :span="3"
204 class="formSelect percent30" 121 :key="childIndex + '5'"
205 v-model="childItem.sjdjbsm" 122 :class="childIndex > 0 ? 'childYT' : ''"
206 > 123 >
207 <el-option 124 <ul>
208 v-for="item in $store.state.tddjList" 125 <li>地类编码</li>
209 :key="item.bsm" 126 <li>地类编码</li>
210 :label="item.mc" 127 <li>年限<i class="requisite">*</i></li>
211 :value="item.bsm" 128 </ul>
129 </el-col>
130 <el-col
131 :span="3"
132 :key="childIndex + '4'"
133 :class="childIndex > 0 ? 'childYT' : ''"
134 >
135 <ul>
136 <li>
137 <input
138 type="text"
139 style="top: -1px;"
140 :disabled="formData.qszt!='0'"
141 v-model="childItem.pzytdm"
142 class="formInput"
143 />
144 </li>
145 <li>
146 <input
147 type="text"
148 :disabled="formData.qszt!='0'"
149 v-model="childItem.sjytdm"
150 class="formInput"
151 />
152 </li>
153 <li>
154 <input
155 type="text"
156 ref="syqx"
157 @blur="inputBlur($event,false)"
158 maxlength="3"
159 onkeyup="value=value.replace(/[^\d]/g,'')"
160 @input="sumTime(index,childIndex,childItem.syqx,childItem.syqx)"
161 :disabled="formData.qszt!='0'"
162 v-model="childItem.syqx"
163 class="formInput"
164 />
165 </li>
166 </ul>
167 </el-col>
168 <el-col
169 :span="3"
170 :key="childIndex + '2'"
171 :class="childIndex > 0 ? 'childYT' : ''"
172 >
173 <ul>
174 <li>等级</li>
175 <li>等级</li>
176 <li>土地使用结束时间<i class="requisite">*</i></li>
177 </ul>
178 </el-col>
179 <el-col
180 :span="4"
181 :key="childIndex + '3'"
182 class="noRightBorder"
183 :class="childIndex > 0 ? 'childYT ' : ''"
184 >
185 <ul>
186 <li>
187 <el-select
188 :disabled="formData.qszt!='0'"
189 class="formSelect percent30"
190 v-model="childItem.pzdjbsm"
212 > 191 >
213 </el-option> 192 <el-option
214 </el-select> 193 v-for="item in $store.state.tddjList"
215 </li> 194 :key="item.bsm"
216 <li> 195 :label="item.mc"
217 <el-date-picker 196 :value="item.bsm"
218 :disabled="formData.qszt!='0'" 197 >
219 v-model="childItem.tdsyjssj" 198 </el-option>
220 type="date" 199 </el-select>
221 ref="tdsyjssj" 200 </li>
222 @blur="inputBlur($event,true)" 201 <li>
223 :picker-options="childItem.pickerEnd" 202 <el-select
224 @input="endTime(index,childIndex,$event)" 203 :disabled="formData.qszt!='0'"
225 value-format="yyyy-MM-dd" 204 class="formSelect percent30"
226 placeholder="选择日期" 205 v-model="childItem.sjdjbsm"
227 > 206 >
228 </el-date-picker> 207 <el-option
229 </li> 208 v-for="item in $store.state.tddjList"
230 </ul> 209 :key="item.bsm"
231 </el-col> 210 :label="item.mc"
211 :value="item.bsm"
212 >
213 </el-option>
214 </el-select>
215 </li>
216 <li>
217 <el-date-picker
218 :disabled="formData.qszt!='0'"
219 v-model="childItem.tdsyjssj"
220 type="date"
221 ref="tdsyjssj"
222 @blur="inputBlur($event,true)"
223 :picker-options="childItem.pickerEnd"
224 @input="endTime(index,childIndex,$event)"
225 value-format="yyyy-MM-dd"
226 placeholder="选择日期"
227 >
228 </el-date-picker>
229 </li>
230 </ul>
231 </el-col>
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>
232 </template> 342 </template>
233 343
234 <div class="title"> 344 <div class="title">
...@@ -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;
......
...@@ -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"
......
...@@ -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" :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" :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" :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" :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,7 @@ ...@@ -155,6 +155,7 @@
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"
158 v-if="show" 159 v-if="show"
159 :default-expand-all="defaultExpandAll" 160 :default-expand-all="defaultExpandAll"
160 :multiple="multiple" 161 :multiple="multiple"
...@@ -170,6 +171,7 @@ ...@@ -170,6 +171,7 @@
170 <td colspan="2" >用途</td> 171 <td colspan="2" >用途</td>
171 <td colspan="4" > 172 <td colspan="4" >
172 <el-select-tree style="width:100%" 173 <el-select-tree style="width:100%"
174 ref="yt"
173 v-if="show" 175 v-if="show"
174 :default-expand-all="defaultExpandAll" 176 :default-expand-all="defaultExpandAll"
175 :multiple="multiple" 177 :multiple="multiple"
...@@ -194,7 +196,7 @@ ...@@ -194,7 +196,7 @@
194 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span> 196 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
195 </td> 197 </td>
196 <td colspan="9" > 198 <td colspan="9" >
197 <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > 199 <el-select class="persent78" ref="fwjg" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
198 <el-option 200 <el-option
199 v-for="item in $store.state.jgOptions" 201 v-for="item in $store.state.jgOptions"
200 :key="item.bsm" 202 :key="item.bsm"
...@@ -207,7 +209,7 @@ ...@@ -207,7 +209,7 @@
207 209
208 <tr> 210 <tr>
209 <td colspan="12" align="center"> 211 <td colspan="12" align="center">
210 <Qlxz ref="qlxzModule" :formData="form"></Qlxz> 212 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
211 </td> 213 </td>
212 </tr> 214 </tr>
213 215
...@@ -216,7 +218,7 @@ ...@@ -216,7 +218,7 @@
216 <span>坐落<i class="requisite">*</i></span> 218 <span>坐落<i class="requisite">*</i></span>
217 </td> 219 </td>
218 <td colspan="10" > 220 <td colspan="10" >
219 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zl"> 221 <input class="formInput" ref="zl" :disabled="form.qszt!='0'" v-model="form.zl">
220 </td> 222 </td>
221 </tr> 223 </tr>
222 224
...@@ -273,7 +275,7 @@ ...@@ -273,7 +275,7 @@
273 275
274 <script> 276 <script>
275 import Qlr from "../../../components/formMenu/qlr"; 277 import Qlr from "../../../components/formMenu/qlr";
276 import Qlxz from "../../../components/formMenu/qlxz_simple"; 278 import Qlxz from "../../../components/formMenu/qlxz";
277 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" 279 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
278 import {getQjZdjbxxDetailById} from "../../../api/zd" 280 import {getQjZdjbxxDetailById} from "../../../api/zd"
279 import {submit,registerCall} from "../../../api/common" 281 import {submit,registerCall} from "../../../api/common"
...@@ -392,7 +394,8 @@ ...@@ -392,7 +394,8 @@
392 DJZQDM:"", 394 DJZQDM:"",
393 ZDTZM:"", 395 ZDTZM:"",
394 BSM:"", 396 BSM:"",
395 } 397 },
398 rules:[],
396 } 399 }
397 }, 400 },
398 methods: { 401 methods: {
...@@ -450,17 +453,91 @@ ...@@ -450,17 +453,91 @@
450 onSave(){ 453 onSave(){
451 //判断自然幢号和不动产单元号是否手动修改过(自然幢号和不动产单元号的前19位是否和宗地代码一致) 454 //判断自然幢号和不动产单元号是否手动修改过(自然幢号和不动产单元号的前19位是否和宗地代码一致)
452 console.log(this.form,'this.form'); 455 console.log(this.form,'this.form');
453 if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){ 456 //给校验项赋值
454 this.$message({ 457 this.rules=[
455 message: '自然幢号或不动产单元号有误,请核对后再试一次', 458 {
456 type: "warning", 459 data:this.form.zrzh,
457 }); 460 name:'自然幢号',
458 }else{ 461 dom:this.$refs.zrzh,
459 this.loading=true; 462 rule: /^\s*$/g, //非空
460 this.form.zrzbsm=this.bsm; 463 },
461 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 464 {
462 if(1>0){ 465 data:this.form.bdcdyh,
463 saveZrzInfo(this.form).then((res)=>{ 466 name:'不动产单元号',
467 dom:this.$refs.bdcdyh,
468 rule: /^\s*$/g, //非空
469 },
470 {
471 data:this.form.xmmc,
472 name:'项目名称',
473 dom:this.$refs.xmmc,
474 rule: /^\s*$/g, //非空
475 },
476 {
477 data:this.form.fwxzbsm,
478 name:'房屋性质',
479 dom:this.$refs.fwxz,
480 rule: /^\s*$/g, //非空
481 },
482 {
483 data:this.form.zl,
484 name:'坐落',
485 dom:this.$refs.zl,
486 rule: /^\s*$/g, //非空
487 },
488 ]
489 this.form.fwytList.forEach((item,index)=>{
490 this.rules.push(
491 {
492 data:this.form.fwytList[index].ghyt,
493 name:'规划用途',
494 dom:this.$refs.ghyt[index],
495 rule: /^\s*$/g, //非空
496 },
497 {
498 data:this.form.fwytList[index].yt,
499 name:'用途',
500 dom:this.$refs.yt[index],
501 rule: /^\s*$/g, //非空
502 },
503 )
504 })
505 this.form.fwjgList.forEach((item,index)=>{
506 this.rules.push(
507 {
508 data:this.form.fwjgList[index].fwjg,
509 name:'房屋结构',
510 dom:this.$refs.fwjg[index],
511 rule: /^\s*$/g, //非空
512 },
513 )
514 })
515 this.loading=true;
516 this.form.zrzbsm=this.bsm;
517 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
518 this.$refs.qlxzModule.getRules();
519 let flag = true;
520 console.log(this.rules,'this.rules');
521 this.rules.forEach(item=>{
522 if(item.rule.test(item.data) || item.data == null){
523 if(item.dom.$el){
524 item.dom.$el.style.border = '1px solid red';
525 }else{
526 item.dom.style.border = '1px solid red';
527 }
528 flag = false;
529 return false
530 }
531 })
532 this.$nextTick(()=>{
533 if (flag) {
534 if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){
535 this.$message({
536 message: '自然幢号或不动产单元号有误,请核对后再试一次',
537 type: "warning",
538 });
539 }else{
540 saveZrzInfo(this.form).then((res)=>{
464 if(res.code===200){ 541 if(res.code===200){
465 this.$message.success("保存完成!") 542 this.$message.success("保存完成!")
466 }else { 543 }else {
...@@ -470,25 +547,31 @@ ...@@ -470,25 +547,31 @@
470 }); 547 });
471 } 548 }
472 this.loading=false; 549 this.loading=false;
473 }) 550 })
474 this.loading=false; 551 this.loading=false;
475 }
476 552
477 //保存到空间库里面 553 //保存到空间库里面
478 var self = this; 554 var self = this;
479 for(var key in this.geoAttributes){ 555 for(var key in this.geoAttributes){
480 if(key == "BSM"){ 556 if(key == "BSM"){
481 self.geoAttributes[key] = this.bsm 557 self.geoAttributes[key] = this.bsm
482 }else{ 558 }else{
483 var formKay = key.toLowerCase(); 559 var formKay = key.toLowerCase();
484 self.geoAttributes[key] = self.formData[formKay]; 560 self.geoAttributes[key] = self.formData[formKay];
561 }
562 }
563 self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
564 console.log("属性保存完成!!");
565 });
485 } 566 }
567 }else{
568 this.$message({
569 // message: item.name+'不能为空',
570 message: '请完善表单后再继续操作',
571 type: "warning",
572 });
486 } 573 }
487 self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) { 574 })
488 console.log("属性保存完成!!");
489 });
490 }
491
492 }, 575 },
493 onSubmit(){ 576 onSubmit(){
494 let data={ 577 let data={
...@@ -526,6 +609,7 @@ ...@@ -526,6 +609,7 @@
526 }); 609 });
527 }, 610 },
528 generatorCode(){ 611 generatorCode(){
612 console.log(this.form,'this.form');
529 if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){ 613 if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){
530 this.open(); 614 this.open();
531 return; 615 return;
...@@ -555,6 +639,10 @@ ...@@ -555,6 +639,10 @@
555 getZrzDetailByBsm(data).then((res)=>{ 639 getZrzDetailByBsm(data).then((res)=>{
556 if(res.code===200){ 640 if(res.code===200){
557 this.form=res.result; 641 this.form=res.result;
642 // //如果没有宗地代码,自动生成
643 // if(res.result.zddm == null){
644 // this.generatorCode()
645 // }
558 this.$store.state.zrzh = res.result.zrzh; 646 this.$store.state.zrzh = res.result.zrzh;
559 if(this.form.fwjgList.length===0){ 647 if(this.form.fwjgList.length===0){
560 this.form.fwjgList.push({ 648 this.form.fwjgList.push({
...@@ -595,6 +683,7 @@ ...@@ -595,6 +683,7 @@
595 } 683 }
596 //权利性质数据传给子组件 684 //权利性质数据传给子组件
597 this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS 685 this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS
686
598 } 687 }
599 } 688 }
600 }) 689 })
......