8f874e2c by 杨威

字段校对

1 parent b397629f
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 <li> 52 <li>
53 <el-select class="formSelect percent30" v-model="items.pzyt"> 53 <el-select class="formSelect percent30" v-model="items.pzyt">
54 <el-option 54 <el-option
55 v-for="item in pzytList" 55 v-for="item in $store.state.tdytList"
56 :key="item.dm" 56 :key="item.dm"
57 :label="item.mc" 57 :label="item.mc"
58 :value="item.dm" 58 :value="item.dm"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <li> 63 <li>
64 <el-select class="formSelect percent30" v-model="items.sjyt"> 64 <el-select class="formSelect percent30" v-model="items.sjyt">
65 <el-option 65 <el-option
66 v-for="item in sjytList" 66 v-for="item in $store.state.tdytList"
67 :key="item.dm" 67 :key="item.dm"
68 :label="item.mc" 68 :label="item.mc"
69 :value="item.dm" 69 :value="item.dm"
...@@ -113,10 +113,10 @@ ...@@ -113,10 +113,10 @@
113 <li> 113 <li>
114 <el-select class="formSelect percent30" v-model="items.dj1"> 114 <el-select class="formSelect percent30" v-model="items.dj1">
115 <el-option 115 <el-option
116 v-for="item in djList" 116 v-for="item in $store.state.tddjList"
117 :key="item.value" 117 :key="item.bsm"
118 :label="item.label" 118 :label="item.mc"
119 :value="item.value" 119 :value="item.bsm"
120 > 120 >
121 </el-option> 121 </el-option>
122 </el-select> 122 </el-select>
...@@ -124,10 +124,10 @@ ...@@ -124,10 +124,10 @@
124 <li> 124 <li>
125 <el-select class="formSelect percent30" v-model="items.dj2"> 125 <el-select class="formSelect percent30" v-model="items.dj2">
126 <el-option 126 <el-option
127 v-for="item in djList" 127 v-for="item in $store.state.tddjList"
128 :key="item.value" 128 :key="item.bsm"
129 :label="item.label" 129 :label="item.mc"
130 :value="item.value" 130 :value="item.bsm"
131 > 131 >
132 </el-option> 132 </el-option>
133 </el-select> 133 </el-select>
...@@ -145,10 +145,10 @@ ...@@ -145,10 +145,10 @@
145 <div class="title"> 145 <div class="title">
146 <el-select class="formSelect" v-model="items.qlxz"> 146 <el-select class="formSelect" v-model="items.qlxz">
147 <el-option 147 <el-option
148 v-for="item in compareList" 148 v-for="item in $store.state.qlxzList"
149 :key="item.value" 149 :key="item.bsm"
150 :label="item.label" 150 :label="item.mc"
151 :value="item.value" 151 :value="item.bsm"
152 > 152 >
153 </el-option> 153 </el-option>
154 </el-select> 154 </el-select>
...@@ -176,14 +176,6 @@ export default { ...@@ -176,14 +176,6 @@ export default {
176 }, 176 },
177 data() { 177 data() {
178 return { 178 return {
179 pzytList:[],
180 sjytList:[],
181 djList:[],
182 compareList: [
183 {label: "=", value: "="},
184 {label: "<=", value: "<="},
185 {label: ">=", value: ">="},
186 ],
187 countList: [ 179 countList: [
188 { 180 {
189 id: Math.random(), 181 id: Math.random(),
...@@ -201,26 +193,12 @@ export default { ...@@ -201,26 +193,12 @@ export default {
201 tdsyjssj: "", 193 tdsyjssj: "",
202 }, 194 },
203 ], 195 ],
196 outNum:0
204 }; 197 };
205 }, 198 },
206 created(){ 199 created(){
207 this.getDicData()
208 }, 200 },
209 methods: { 201 methods: {
210 //获取字典数据
211 getDicData(){
212 getDdicByMC("土地用途")
213 .then((res) => {
214 this.pzytList = res.result;
215 this.sjytList = res.result;
216 })
217 .catch((error) => {});
218 getDdicByMC("土地等级")
219 .then((res) => {
220 this.djList = res.result;
221 })
222 .catch((error) => {});
223 },
224 //外层操作 202 //外层操作
225 handleClick(id, ind, type) { 203 handleClick(id, ind, type) {
226 if (type === "add") { 204 if (type === "add") {
...@@ -239,12 +217,14 @@ export default { ...@@ -239,12 +217,14 @@ export default {
239 dj2: "", 217 dj2: "",
240 tdsyjssj: "", 218 tdsyjssj: "",
241 }); 219 });
220 this.outNum++
242 } else { 221 } else {
243 this.countList.forEach((item, index) => { 222 this.countList.forEach((item, index) => {
244 if (index == ind && this.countList.length > 1) { 223 if (index == ind && this.countList.length > 1) {
245 this.countList.splice(index, 1); 224 this.countList.splice(index, 1);
246 } 225 }
247 }); 226 });
227 this.outNum--
248 } 228 }
249 this.hasBorderOrNot(); 229 this.hasBorderOrNot();
250 }, 230 },
...@@ -283,9 +263,14 @@ export default { ...@@ -283,9 +263,14 @@ export default {
283 tempNum++; 263 tempNum++;
284 } 264 }
285 }); 265 });
266 //判断外层是否没有增加,如果没有增加,则不能删除当前外层
267 if(ind == 0 && this.outNum == 0){
268
269 }else{
286 this.countList.splice(tempIndex, tempNum); 270 this.countList.splice(tempIndex, tempNum);
287 } 271 }
288 } 272 }
273 }
289 this.hasBorderOrNot(); 274 this.hasBorderOrNot();
290 }, 275 },
291 //判断是否显示边框 276 //判断是否显示边框
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 <input 127 <input
128 type="text" 128 type="text"
129 class="formInput percent78" 129 class="formInput percent78"
130 v-model="formData.bdcdyh" 130 v-model="formData.dyhbsm"
131 /> 131 />
132 <el-button type="primary" class="createBtn">生成</el-button> 132 <el-button type="primary" class="createBtn">生成</el-button>
133 </td> 133 </td>
...@@ -149,12 +149,12 @@ ...@@ -149,12 +149,12 @@
149 <tr> 149 <tr>
150 <td colspan="2">国民经济行业分类</td> 150 <td colspan="2">国民经济行业分类</td>
151 <td colspan="4"> 151 <td colspan="4">
152 <el-select class="formSelect" v-model="formData.gmjjhyfl"> 152 <el-select class="formSelect" v-model="formData.gmjjhyflbsm">
153 <el-option 153 <el-option
154 v-for="item in $store.state.sshyList" 154 v-for="item in $store.state.sshyList"
155 :key="item.value" 155 :key="item.bsm"
156 :label="item.label" 156 :label="item.mc"
157 :value="item.value" 157 :value="item.bsm"
158 > 158 >
159 </el-option> 159 </el-option>
160 </el-select> 160 </el-select>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
180 <tr> 180 <tr>
181 <td colspan="2">容积率</td> 181 <td colspan="2">容积率</td>
182 <td colspan="2"> 182 <td colspan="2">
183 <el-select class="formSelect" v-model="formData.rjl"> 183 <el-select class="formSelect" v-model="formData.jyrjl">
184 <el-option 184 <el-option
185 v-for="item in compareList" 185 v-for="item in compareList"
186 :key="item.value" 186 :key="item.value"
...@@ -191,7 +191,9 @@ ...@@ -191,7 +191,9 @@
191 </el-select> 191 </el-select>
192 </td> 192 </td>
193 <td colspan="2"> 193 <td colspan="2">
194 <input type="text" class="formInput"/> 194 <input type="text" v-model="formData.rjl" :class="formData.jyrjl=='-'? 'formInput percent47' : 'formInput'"/>
195 <span class="percent4" v-show="formData.jyrjl=='-'">-</span>
196 <input type="text" v-show="formData.jyrjl=='-'" v-model="formData.rjl" class="formInput percent47"/>
195 </td> 197 </td>
196 <td colspan="2">容积说明</td> 198 <td colspan="2">容积说明</td>
197 <td colspan="4" class="psr"> 199 <td colspan="4" class="psr">
...@@ -201,7 +203,7 @@ ...@@ -201,7 +203,7 @@
201 <tr> 203 <tr>
202 <td colspan="2">建筑密度</td> 204 <td colspan="2">建筑密度</td>
203 <td colspan="2"> 205 <td colspan="2">
204 <el-select class="formSelect" v-model="formData.jzmd"> 206 <el-select class="formSelect" v-model="formData.jyjzmd">
205 <el-option 207 <el-option
206 v-for="item in compareList" 208 v-for="item in compareList"
207 :key="item.value" 209 :key="item.value"
...@@ -212,7 +214,9 @@ ...@@ -212,7 +214,9 @@
212 </el-select> 214 </el-select>
213 </td> 215 </td>
214 <td colspan="2"> 216 <td colspan="2">
215 <input type="text" class="formInput"/> 217 <input type="text" v-model="formData.jzmd" :class="formData.jyjzmd=='-'? 'formInput percent47' : 'formInput'"/>
218 <span class="percent4" v-show="formData.jyjzmd=='-'">-</span>
219 <input type="text" v-show="formData.jyjzmd=='-'" v-model="formData.jzmd" class="formInput percent47"/>
216 </td> 220 </td>
217 <td colspan="2">建筑密度说明</td> 221 <td colspan="2">建筑密度说明</td>
218 <td colspan="4" class="psr"> 222 <td colspan="4" class="psr">
...@@ -222,7 +226,7 @@ ...@@ -222,7 +226,7 @@
222 <tr> 226 <tr>
223 <td colspan="2">建筑限高</td> 227 <td colspan="2">建筑限高</td>
224 <td colspan="2"> 228 <td colspan="2">
225 <el-select class="formSelect" v-model="formData.jzxg"> 229 <el-select class="formSelect" v-model="formData.jyjzxg">
226 <el-option 230 <el-option
227 v-for="item in compareList" 231 v-for="item in compareList"
228 :key="item.value" 232 :key="item.value"
...@@ -233,7 +237,9 @@ ...@@ -233,7 +237,9 @@
233 </el-select> 237 </el-select>
234 </td> 238 </td>
235 <td colspan="2"> 239 <td colspan="2">
236 <input type="text" class="formInput percent68"/> 240 <input type="text" v-model="formData.jzxg" :class="formData.jyjzxg=='-'? 'formInput percent47' : 'formInput'"/>
241 <span class="percent4" v-show="formData.jyjzxg=='-'">-</span>
242 <input type="text" v-show="formData.jyjzxg=='-'" v-model="formData.jzxg" class="formInput percent47"/>
237 </td> 243 </td>
238 <td colspan="2">建筑限高说明</td> 244 <td colspan="2">建筑限高说明</td>
239 <td colspan="4" class="psr"> 245 <td colspan="4" class="psr">
...@@ -244,25 +250,25 @@ ...@@ -244,25 +250,25 @@
244 <td colspan="2" rowspan="4">宗地四至</td> 250 <td colspan="2" rowspan="4">宗地四至</td>
245 <td colspan="2">北至<i class="requisite">*</i></td> 251 <td colspan="2">北至<i class="requisite">*</i></td>
246 <td colspan="8" class="psr"> 252 <td colspan="8" class="psr">
247 <input type="text" class="formInput" v-model="formData.bz"/> 253 <input type="text" class="formInput" v-model="formData.zdszb"/>
248 </td> 254 </td>
249 </tr> 255 </tr>
250 <tr> 256 <tr>
251 <td colspan="2">东至<i class="requisite">*</i></td> 257 <td colspan="2">东至<i class="requisite">*</i></td>
252 <td colspan="8" class="psr"> 258 <td colspan="8" class="psr">
253 <input type="text" class="formInput" v-model="formData.dz"/> 259 <input type="text" class="formInput" v-model="formData.zdszd"/>
254 </td> 260 </td>
255 </tr> 261 </tr>
256 <tr> 262 <tr>
257 <td colspan="2">南至<i class="requisite">*</i></td> 263 <td colspan="2">南至<i class="requisite">*</i></td>
258 <td colspan="8" class="psr"> 264 <td colspan="8" class="psr">
259 <input type="text" class="formInput" v-model="formData.nz"/> 265 <input type="text" class="formInput" v-model="formData.zdszn"/>
260 </td> 266 </td>
261 </tr> 267 </tr>
262 <tr> 268 <tr>
263 <td colspan="2">西至<i class="requisite">*</i></td> 269 <td colspan="2">西至<i class="requisite">*</i></td>
264 <td colspan="8" class="psr"> 270 <td colspan="8" class="psr">
265 <input type="text" class="formInput" v-model="formData.xz"/> 271 <input type="text" class="formInput" v-model="formData.zdszx"/>
266 </td> 272 </td>
267 </tr> 273 </tr>
268 <tr> 274 <tr>
...@@ -279,7 +285,7 @@ ...@@ -279,7 +285,7 @@
279 <td colspan="2" rowspan="2"> 285 <td colspan="2" rowspan="2">
280 <input type="text" class="formInput" v-model="formData.zdmj"/> 286 <input type="text" class="formInput" v-model="formData.zdmj"/>
281 </td> 287 </td>
282 <td colspan="2">建筑占地面积</td> 288 <td colspan="2">建筑占地面积</td>
283 <td colspan="2"> 289 <td colspan="2">
284 <input type="text" class="formInput" v-model="formData.jzzdzmj"/> 290 <input type="text" class="formInput" v-model="formData.jzzdzmj"/>
285 </td> 291 </td>
...@@ -287,13 +293,13 @@ ...@@ -287,13 +293,13 @@
287 <tr> 293 <tr>
288 <td colspan="2">建筑面积(㎡)</td> 294 <td colspan="2">建筑面积(㎡)</td>
289 <td colspan="2"> 295 <td colspan="2">
290 <input type="text" class="formInput" v-model="formData.jzmj"/> 296 <input type="text" class="formInput" v-model="formData.jzzmj"/>
291 </td> 297 </td>
292 </tr> 298 </tr>
293 <tr> 299 <tr>
294 <td colspan="2">共有/共用权利人情况</td> 300 <td colspan="2">共有/共用权利人情况</td>
295 <td colspan="10"> 301 <td colspan="10">
296 <input type="text" class="formInput" v-model="formData.gyqlrqk"/> 302 <input type="text" class="formInput" v-model="formData.gygyqlrqk"/>
297 </td> 303 </td>
298 </tr> 304 </tr>
299 <tr> 305 <tr>
...@@ -332,39 +338,90 @@ ...@@ -332,39 +338,90 @@
332 {label: "=", value: "="}, 338 {label: "=", value: "="},
333 {label: "<=", value: "<="}, 339 {label: "<=", value: "<="},
334 {label: ">=", value: ">="}, 340 {label: ">=", value: ">="},
341 {label: "-", value: "-"}
335 ], 342 ],
336 formData: { 343 formData: {
337 xzqbsm: "", 344 "addQjQlxzRequestList": [
338 djqbsm: "", 345 {
339 djzqbsm: "", 346 "addQjTdytRequestList": [
340 qllxbsm: "", 347 {
341 zdtzmbsm: "", 348 "bz": "",
342 qlsdfs: "", 349 "mj": 0,
343 zddm: "", 350 "pzdjbsm": "",
344 djh: "", 351 "pzdjmc": "",
345 bdcdyh: "", 352 "pzytdm": "",
346 zl: "", 353 "pzytmc": "",
347 tdqslyzmcl: "", 354 "pzytmj": 0,
348 gmjjhyfl: "", 355 "qlxzbsm": "",
349 jg: "", 356 "sjdjbsm": "",
350 blc: "", 357 "sjdjmc": "",
351 tfh: "", 358 "sjytdm": "",
352 rjl: "", 359 "sjytmc": "",
353 rjsm: "", 360 "sjytmj": 0,
354 jzmd: "", 361 "syqx": "",
355 jzmdsm: "", 362 "tdsyjssj": "2020-10-22T09:07:38.644Z",
356 jzxg: "", 363 "tdsyqssj": "2020-10-22T09:07:38.644Z",
357 jzxgsm: "", 364 "tdzh": ""
358 bz: "", 365 }
359 dz: "", 366 ],
360 nz: "", 367 "bsm": "",
361 xz: "", 368 "glbsm": "",
362 pzmj: "", 369 "qlxzdm": "",
363 zdmj: "", 370 "qlxzmc": "",
364 jzzdmj: "", 371 "qlxzzdbsm": "",
365 jzmj: "", 372 "zhqlxzlx": 0
366 gyqlrqk: "", 373 }
367 sm: "", 374 ],
375 "bblx": 0,
376 "bbsxh": 0,
377 "bhqkbsm": "",
378 "blc": "",
379 "bz": "",
380 "dcrq": "2020-10-22T09:07:38.644Z",
381 "dcy": "",
382 "dcyj": "",
383 "djh": "",
384 "djqbsm": "",
385 "djzqbsm": "",
386 "dyhbsm": "",
387 "gmjjhyflbsm": "",
388 "gygyqlrqk": "",
389 "jg": 0,
390 "jyjzmu": "",
391 "jyjzxg": "",
392 "jyrjl": "",
393 "jzmd": 0,
394 "jzmdsm": "",
395 "jzxg": 0,
396 "jzxgsm": "",
397 "jzzdzmj": 0,
398 "jzzmj": 0,
399 "mjdw": "",
400 "pzmj": 0,
401 "qllxbsm": "",
402 "qlsdfs": "",
403 "qszt": "",
404 "rjl": 0,
405 "rjlsm": "",
406 "sfwqfg": "",
407 "sjly": 0,
408 "syqlxbsm": "",
409 "tdqslyzmcl": "",
410 "tfh": "",
411 "userbsm": "",
412 "xmmc": "",
413 "xzqbsm": "",
414 "ydybsm": "",
415 "ysclbsm": "",
416 "zdbsm": "",
417 "zddm": "",
418 "zdmj": 0,
419 "zdszb": "",
420 "zdszd": "",
421 "zdszn": "",
422 "zdszx": "",
423 "zdtzmbsm": "",
424 "zl": ""
368 }, 425 },
369 }; 426 };
370 }, 427 },
...@@ -491,6 +548,16 @@ ...@@ -491,6 +548,16 @@
491 position: relative; 548 position: relative;
492 top: 7px; 549 top: 7px;
493 } 550 }
551 .percent47 {
552 width: 45% !important;
553 float: left;
554 }
555 .percent4 {
556 height: 20px;
557 line-height: 20px;
558 width: 4% !important;
559 float: left;
560 }
494 .percent30 { 561 .percent30 {
495 width: 30% !important; 562 width: 30% !important;
496 float: left; 563 float: left;
......