Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
172 additions
and
123 deletions
... | @@ -75,3 +75,25 @@ export function ZdfggetZxx(zdbsm) { | ... | @@ -75,3 +75,25 @@ export function ZdfggetZxx(zdbsm) { |
75 | } | 75 | } |
76 | }) | 76 | }) |
77 | } | 77 | } |
78 | /** | ||
79 | * 多幢分割获取自然幢信息 | ||
80 | */ | ||
81 | export function dzfgGetZrzxx(dzbsm) { | ||
82 | return request({ | ||
83 | url:"/bg/dzSplitMerge/fgSelectZrz", | ||
84 | method:'get', | ||
85 | params:{ | ||
86 | dzbsm | ||
87 | } | ||
88 | }) | ||
89 | } | ||
90 | /** | ||
91 | * 多幢分割保存 | ||
92 | */ | ||
93 | export function saveDzFg(data) { | ||
94 | return request({ | ||
95 | url: '/bg/dzSplitMerge/dzFg', | ||
96 | method: 'post', | ||
97 | data: data, | ||
98 | }) | ||
99 | } | ... | ... |
... | @@ -154,16 +154,16 @@ | ... | @@ -154,16 +154,16 @@ |
154 | <el-tabs v-model="activeName" type="card"> | 154 | <el-tabs v-model="activeName" type="card"> |
155 | <el-tab-pane label="多幢" name="dz"> | 155 | <el-tab-pane label="多幢" name="dz"> |
156 | <ul> | 156 | <ul> |
157 | <li :class="[zdFghData.newZdlist[index].dz.indexOf(childItem) > -1 ? 'choosed':'',(zdDzList[childIndex].hasChoosed === index || zdDzList[childIndex].hasChoosed === '' )? '':'cantClick']" | 157 | <li :class="[zdFghData.newZdlist[index].dz.indexOf(childItem) > -1 ? 'choosed':'',(childItem.hasChoosed === index || childItem.hasChoosed === '' )? '':'cantClick']" |
158 | @click="dzHandleCommand(childItem,childItem.bsm,index,childIndex)" v-for="(childItem,childIndex) in zdDzList" :key="childItem.bsm+childIndex"> | 158 | @click="dzHandleCommand(childItem,childItem.bsm,index,childIndex)" v-for="(childItem,childIndex) in zdDzList" :key="childIndex*Math.random()"> |
159 | {{childItem.xmmc}}<i class="fa fa-check" style="color:'#4EB2FF'"></i> | 159 | {{childItem.xmmc}}<i class="fa fa-check" style="color:'#4EB2FF'"></i> |
160 | </li> | 160 | </li> |
161 | </ul> | 161 | </ul> |
162 | </el-tab-pane> | 162 | </el-tab-pane> |
163 | <el-tab-pane label="自然幢" name="zrz"> | 163 | <el-tab-pane label="自然幢" name="zrz"> |
164 | <ul> | 164 | <ul> |
165 | <li :class="[zdFghData.newZdlist[index].zrz.indexOf(childItem) > -1 ? 'choosed':'',(zdZrzList[childIndex].hasChoosed === index || zdZrzList[childIndex].hasChoosed === '' )? '':'cantClick']" | 165 | <li :class="[zdFghData.newZdlist[index].zrz.indexOf(childItem) > -1 ? 'choosed':'',(childItem.hasChoosed === index || childItem.hasChoosed === '' )? '':'cantClick']" |
166 | @click="zrzHandleCommand(childItem,childItem.bsm,index,childIndex)" v-for="(childItem,childIndex) in zdZrzList" :key="childItem.bsm+childIndex"> | 166 | @click="zrzHandleCommand(childItem,childItem.bsm,index,childIndex)" v-for="(childItem,childIndex) in zdZrzList" :key="childIndex*Math.random()"> |
167 | {{childItem.xmmc}} <i class="fa fa-check" style="color:'#4EB2FF'"></i> | 167 | {{childItem.xmmc}} <i class="fa fa-check" style="color:'#4EB2FF'"></i> |
168 | </li> | 168 | </li> |
169 | </ul> | 169 | </ul> |
... | @@ -209,35 +209,16 @@ | ... | @@ -209,35 +209,16 @@ |
209 | <div class="zxx"> | 209 | <div class="zxx"> |
210 | <el-card class="zrz"> | 210 | <el-card class="zrz"> |
211 | <div slot="header" class="clearfix"> | 211 | <div slot="header" class="clearfix"> |
212 | <span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{zdZxx.zrzList.length}}</span>幢</span> | 212 | <span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{dzFgqZrzData.length}}</span>幢</span> |
213 | </div> | 213 | </div> |
214 | <ul> | 214 | <ul> |
215 | <li v-for="(item,index) in zdZxx.zrzList" :key="index+item.xmmc" | 215 | <li v-for="(item,index) in dzFgqZrzData" :key="index+item.xmmc" |
216 | :class="tempBsmList.indexOf(item.bsm) > -1 ? 'hasChoosed':''" | 216 | :class="tempBsmList.indexOf(item.bsm) > -1 ? 'hasChoosed':''" |
217 | > | 217 | > |
218 | <i class="iconfont iconziranchuang"></i> {{item.displays}} | 218 | <i class="iconfont iconziranchuang"></i> {{item.xmmc}} |
219 | </li> | 219 | </li> |
220 | </ul> | 220 | </ul> |
221 | </el-card> | 221 | </el-card> |
222 | |||
223 | <!-- <div class="dz"> | ||
224 | <div class="title"> | ||
225 | <span>多幢信息({{zdZxx.zrzList.length}}个)</span> | ||
226 | </div> | ||
227 | <ul> | ||
228 | <li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li> | ||
229 | </ul> | ||
230 | </div> | ||
231 | <div class="zrz"> | ||
232 | <div class="title"> | ||
233 | <span class="">自然幢信息({{zdZxx.dzList.length}}个)</span> | ||
234 | </div> | ||
235 | <ul> | ||
236 | <li v-for="(item,index) in zdZxx.dzList" :key="index" | ||
237 | :class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}} | ||
238 | </li> | ||
239 | </ul> | ||
240 | </div> --> | ||
241 | </div> | 222 | </div> |
242 | </div> | 223 | </div> |
243 | <div class="fgh"> | 224 | <div class="fgh"> |
... | @@ -252,14 +233,11 @@ | ... | @@ -252,14 +233,11 @@ |
252 | >+ | 233 | >+ |
253 | </el-button> | 234 | </el-button> |
254 | </th> | 235 | </th> |
255 | <th class="xzq">行政区</th> | 236 | <th class="xzq">幢类型</th> |
256 | <th class="djq">地籍区</th> | 237 | <th class="xmmc" width="300px">项目名称</th> |
257 | <th class="djzq">地籍子区</th> | 238 | <th class="xmmc">幢信息</th> |
258 | <th class="syqlx">所有权类型</th> | ||
259 | <th class="tdtzm">土地特征码</th> | ||
260 | <th class="xmmc">项目名称</th> | ||
261 | </tr> | 239 | </tr> |
262 | <tr v-for="(item,index) in dzFghData.newZdlist" :key="index"> | 240 | <tr v-for="(item,index) in dzFghData.fwlist" :key="index*Math.random()"> |
263 | <td class="cz"> | 241 | <td class="cz"> |
264 | <el-button | 242 | <el-button |
265 | type="primary" | 243 | type="primary" |
... | @@ -270,49 +248,9 @@ | ... | @@ -270,49 +248,9 @@ |
270 | > | 248 | > |
271 | </td> | 249 | </td> |
272 | <td class="xzq"> | 250 | <td class="xzq"> |
273 | <el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)"> | 251 | <el-select v-model="item.ztype" @change="changeXzq(item.xzqbsm,index)"> |
274 | <el-option | ||
275 | v-for="i in xzq" | ||
276 | :key="i.bsm" | ||
277 | :label="i.mc" | ||
278 | :value="i.bsm" | ||
279 | ></el-option> | ||
280 | </el-select> | ||
281 | </td> | ||
282 | <td class="djq"> | ||
283 | <el-select v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)"> | ||
284 | <el-option | ||
285 | v-for="i in djq" | ||
286 | :key="i.bsm" | ||
287 | :label="i.mc" | ||
288 | :value="i.bsm" | ||
289 | ></el-option> | ||
290 | </el-select> | ||
291 | </td> | ||
292 | <td class="syqlx"> | ||
293 | <el-select v-model="item.djzqbsm"> | ||
294 | <el-option | 252 | <el-option |
295 | v-for="i in djzq" | 253 | v-for="i in zlx" |
296 | :key="i.bsm" | ||
297 | :label="i.mc" | ||
298 | :value="i.bsm" | ||
299 | ></el-option> | ||
300 | </el-select> | ||
301 | </td> | ||
302 | <td class="tdtzm"> | ||
303 | <el-select v-model="item.syqlxbsm"> | ||
304 | <el-option | ||
305 | v-for="i in syq" | ||
306 | :key="i.value" | ||
307 | :label="i.label" | ||
308 | :value="i.value" | ||
309 | ></el-option> | ||
310 | </el-select> | ||
311 | </td> | ||
312 | <td class="syqlx"> | ||
313 | <el-select v-model="item.zdtzmbsm"> | ||
314 | <el-option | ||
315 | v-for="i in tdtzm" | ||
316 | :key="i.bsm" | 254 | :key="i.bsm" |
317 | :label="i.mc" | 255 | :label="i.mc" |
318 | :value="i.bsm" | 256 | :value="i.bsm" |
... | @@ -322,6 +260,36 @@ | ... | @@ -322,6 +260,36 @@ |
322 | <td class="xmmc"> | 260 | <td class="xmmc"> |
323 | <input type="text" v-model="item.xmmc" class="formInput"/> | 261 | <input type="text" v-model="item.xmmc" class="formInput"/> |
324 | </td> | 262 | </td> |
263 | <td class="zxx"> | ||
264 | <div class="fghzxx"> | ||
265 | <div class="choosedZxx"> | ||
266 | <span v-for="(dzItem,dzIndex) in item.zrzmclist" :key="dzIndex*Math.random()" class="zxx"> | ||
267 | {{dzItem}} | ||
268 | <i class="fa fa-times" @click="delZxx(dzItem,index,dzIndex,'dz')"></i> | ||
269 | </span> | ||
270 | </div> | ||
271 | <p class="choose"> | ||
272 | <el-popover | ||
273 | placement="top-end" | ||
274 | width="300" | ||
275 | popper-class="popper-zxx" | ||
276 | style="padding:0 12px" | ||
277 | trigger="click"> | ||
278 | <ul> | ||
279 | <!-- <li :class="[zdFghData.newZdlist[index].dz.indexOf(childItem) > -1 ? 'choosed':'',(zdDzList[childIndex].hasChoosed === index || zdDzList[childIndex].hasChoosed === '' )? '':'cantClick']" | ||
280 | @click="zrzHandleCommand(childItem,childItem.bsm,index,childIndex)" --> | ||
281 | <li :class="[dzFghData.fwlist[index].zrzlist.indexOf(childItem.bsm) > -1 ? 'choosed':'',(childItem.hasChoosed === index || childItem.hasChoosed === '' )? '':'cantClick']" | ||
282 | v-for="(childItem,childIndex) in dzFgZrzList" :key="childIndex*Math.random()" | ||
283 | @click="zrzHandleCommand(childItem,childItem.bsm,index,childIndex)" | ||
284 | > | ||
285 | {{childItem.xmmc}}<i class="fa fa-check" style="color:'#4EB2FF'"></i> | ||
286 | </li> | ||
287 | </ul> | ||
288 | <span slot="reference">选择</span> | ||
289 | </el-popover> | ||
290 | </p> | ||
291 | </div> | ||
292 | </td> | ||
325 | </tr> | 293 | </tr> |
326 | </table> | 294 | </table> |
327 | </div> | 295 | </div> |
... | @@ -483,7 +451,7 @@ | ... | @@ -483,7 +451,7 @@ |
483 | getDdicByMC | 451 | getDdicByMC |
484 | } from "./../../../../api/common"; | 452 | } from "./../../../../api/common"; |
485 | import {getQjZdjbxxDetailById, zdfg, getZrz} from './../../../../api/zd' | 453 | import {getQjZdjbxxDetailById, zdfg, getZrz} from './../../../../api/zd' |
486 | import {getZdxx, ZdfggetZxx} from './../../../../api/dz' | 454 | import {getZdxx, ZdfggetZxx,dzfgGetZrzxx,saveDzFg} from './../../../../api/dz' |
487 | import {getHZdxx} from './../../../../api/h' | 455 | import {getHZdxx} from './../../../../api/h' |
488 | import QueryData from './../../../../components/queryData/queryData' | 456 | import QueryData from './../../../../components/queryData/queryData' |
489 | import zdQueryData from './../../../../components/zdQueryData/zdQueryData' | 457 | import zdQueryData from './../../../../components/zdQueryData/zdQueryData' |
... | @@ -544,8 +512,8 @@ | ... | @@ -544,8 +512,8 @@ |
544 | newZdlist: [] | 512 | newZdlist: [] |
545 | }, | 513 | }, |
546 | dzFghData: { | 514 | dzFghData: { |
547 | oldZdbsm: "", | 515 | olddzbsm: "", |
548 | newZdlist: [] | 516 | fwlist: [] |
549 | }, | 517 | }, |
550 | hFghData: { | 518 | hFghData: { |
551 | oldZdbsm: "", | 519 | oldZdbsm: "", |
... | @@ -554,7 +522,19 @@ | ... | @@ -554,7 +522,19 @@ |
554 | fgBoxWidth: 0, | 522 | fgBoxWidth: 0, |
555 | tableHeight:0, | 523 | tableHeight:0, |
556 | activeName:'dz', | 524 | activeName:'dz', |
557 | tempBsmList:[] | 525 | tempBsmList:[], |
526 | dzFgqZrzData:[], //多幢分割前自然幢数据 | ||
527 | zlx:[ | ||
528 | { | ||
529 | bsm:'dz', | ||
530 | mc:'多幢' | ||
531 | }, | ||
532 | { | ||
533 | bsm:'zrz', | ||
534 | mc:'自然幢' | ||
535 | } | ||
536 | ], | ||
537 | dzFgZrzList:[] //多幢分割前供分割选择的自然幢数据 | ||
558 | } | 538 | } |
559 | }, | 539 | }, |
560 | created() { | 540 | created() { |
... | @@ -569,28 +549,23 @@ | ... | @@ -569,28 +549,23 @@ |
569 | }, | 549 | }, |
570 | methods: { | 550 | methods: { |
571 | delZxx(item,index, chilInd,type) { | 551 | delZxx(item,index, chilInd,type) { |
572 | let dz={}; | ||
573 | let len=this.zdFghData.newZdlist[index].fwlist.length-1; | ||
574 | this.tempBsmList = this.tempBsmList.filter(i => i!== item.bsm); | ||
575 | switch (type) { | 552 | switch (type) { |
576 | case "dz": | 553 | case "dz": |
577 | dz = this.zdFghData.newZdlist[index].dz[chilInd]; | ||
578 | // 删除数据 | 554 | // 删除数据 |
579 | this.zdFghData.newZdlist[index].dz.splice(chilInd, 1); | 555 | let bsm = this.dzFghData.fwlist[index].zrzlist[chilInd]; |
580 | for (let i=0;i<len;i++){ | 556 | this.dzFghData.fwlist[index].zrzmclist.splice(chilInd,1); |
581 | let fw=this.zdFghData.newZdlist[index].fwlist[i]; | 557 | this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1); |
582 | if (fw.ztype=='dz'&& fw.zbsm == dz.bsm){ | 558 | this.tempBsmList = this.tempBsmList.filter(i => i!== bsm); |
583 | this.zdFghData.newZdlist[index].fwlist.splice(i, 1); | 559 | this.dzFgqZrzData.forEach(i=>{ |
584 | } | 560 | if (i.bsm == bsm) { |
585 | } | ||
586 | this.zdDzList.forEach(i=>{ | ||
587 | if (i.bsm == item.bsm) { | ||
588 | i.hasChoosed = "" | 561 | i.hasChoosed = "" |
589 | } | 562 | } |
590 | }) | 563 | }) |
591 | break; | 564 | break; |
592 | case "zrz": | 565 | case "zrz": |
593 | dz = this.zdFghData.newZdlist[index].zrz[chilInd]; | 566 | dz = this.zdFghData.newZdlist[index].zrz[chilInd]; |
567 | let len=this.zdFghData.newZdlist[index].fwlist.length-1; | ||
568 | this.tempBsmList = this.tempBsmList.filter(i => i!== item.bsm); | ||
594 | // 删除数据 | 569 | // 删除数据 |
595 | this.zdFghData.newZdlist[index].zrz.splice(chilInd, 1); | 570 | this.zdFghData.newZdlist[index].zrz.splice(chilInd, 1); |
596 | for (let i=0;i<len;i++){ | 571 | for (let i=0;i<len;i++){ |
... | @@ -620,8 +595,8 @@ | ... | @@ -620,8 +595,8 @@ |
620 | break | 595 | break |
621 | case "dz": | 596 | case "dz": |
622 | this.dzFghData = { | 597 | this.dzFghData = { |
623 | oldZdbsm: "", | 598 | olddzbsm: "", |
624 | newZdlist: [] | 599 | fwlist: [] |
625 | } | 600 | } |
626 | break | 601 | break |
627 | case "h": | 602 | case "h": |
... | @@ -646,7 +621,9 @@ | ... | @@ -646,7 +621,9 @@ |
646 | ztype: 'zrz' | 621 | ztype: 'zrz' |
647 | }) | 622 | }) |
648 | }, | 623 | }, |
624 | |||
649 | dzHandleCommand(obj,bsm, index,childIndex) { | 625 | dzHandleCommand(obj,bsm, index,childIndex) { |
626 | //判断选中状态 | ||
650 | if(this.zdDzList[childIndex].hasChoosed === '' || this.zdDzList[childIndex].hasChoosed === index){ | 627 | if(this.zdDzList[childIndex].hasChoosed === '' || this.zdDzList[childIndex].hasChoosed === index){ |
651 | this.zdDzList[childIndex].hasChoosed = index; | 628 | this.zdDzList[childIndex].hasChoosed = index; |
652 | if(this.zdFghData.newZdlist[index].dz.indexOf(obj) < 0){ | 629 | if(this.zdFghData.newZdlist[index].dz.indexOf(obj) < 0){ |
... | @@ -666,6 +643,8 @@ | ... | @@ -666,6 +643,8 @@ |
666 | } | 643 | } |
667 | }, | 644 | }, |
668 | zrzHandleCommand(obj,bsm, index,childIndex) { | 645 | zrzHandleCommand(obj,bsm, index,childIndex) { |
646 | switch (this.tabName) { | ||
647 | case 'zd': | ||
669 | if(this.zdZrzList[childIndex].hasChoosed === '' || this.zdZrzList[childIndex].hasChoosed === index){ | 648 | if(this.zdZrzList[childIndex].hasChoosed === '' || this.zdZrzList[childIndex].hasChoosed === index){ |
670 | this.zdZrzList[childIndex].hasChoosed = index; | 649 | this.zdZrzList[childIndex].hasChoosed = index; |
671 | if(this.zdFghData.newZdlist[index].zrz.indexOf(obj) < 0){ | 650 | if(this.zdFghData.newZdlist[index].zrz.indexOf(obj) < 0){ |
... | @@ -683,7 +662,36 @@ | ... | @@ -683,7 +662,36 @@ |
683 | }else{ | 662 | }else{ |
684 | return | 663 | return |
685 | } | 664 | } |
665 | case 'dz': | ||
666 | let fwlist = this.dzFghData.fwlist[index]; | ||
667 | if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){ | ||
668 | // this.zdZrzList[childIndex].hasChoosed = index; | ||
669 | if(fwlist.zrzlist.indexOf(bsm) < 0){ | ||
670 | if(fwlist.ztype == 'zrz' && fwlist.zrzlist.length>0){ | ||
671 | Message.warning("当前幢类型只能选择一个自然幢") | ||
672 | }else{ | ||
673 | //存入当前选择幢信息的bsm | ||
674 | fwlist.zrzlist.push(bsm) | ||
675 | fwlist.zrzmclist.push(obj.xmmc) | ||
676 | this.tempBsmList.push(bsm); | ||
677 | this.dzFgZrzList[childIndex].hasChoosed = index; | ||
678 | } | ||
679 | }else{ | ||
680 | fwlist.zrzlist = fwlist.zrzlist.filter(i => i !== bsm); | ||
681 | fwlist.zrzmclist = fwlist.zrzmclist.filter(i => i !== obj.xmmc); | ||
682 | this.tempBsmList = this.tempBsmList.filter(i => i!== bsm); | ||
683 | this.dzFgZrzList[childIndex].hasChoosed = ''; | ||
684 | } | ||
685 | }else{ | ||
686 | return | ||
687 | } | ||
688 | break; | ||
689 | |||
690 | default: | ||
691 | break; | ||
692 | } | ||
686 | }, | 693 | }, |
694 | //宗地分割前获取幢信息 | ||
687 | ZdgetDzXx(zdbsm) { | 695 | ZdgetDzXx(zdbsm) { |
688 | ZdfggetZxx(zdbsm).then(res => { | 696 | ZdfggetZxx(zdbsm).then(res => { |
689 | if (res.success) { | 697 | if (res.success) { |
... | @@ -700,6 +708,18 @@ | ... | @@ -700,6 +708,18 @@ |
700 | } | 708 | } |
701 | }) | 709 | }) |
702 | }, | 710 | }, |
711 | //多幢分割前获取自然幢信息 | ||
712 | dzfgGetZrzxx(dzbsm){ | ||
713 | dzfgGetZrzxx(dzbsm).then(res => { | ||
714 | if (res.success) { | ||
715 | console.log(res.result,'res.result'); | ||
716 | res.result.forEach(item=>{ | ||
717 | item.hasChoosed = '' | ||
718 | }) | ||
719 | this.dzFgqZrzData = res.result; | ||
720 | } | ||
721 | }) | ||
722 | }, | ||
703 | handleNodeClick(node) { | 723 | handleNodeClick(node) { |
704 | this.zdFghData.newZdlist[this.selectIndex].fwlist.push({ | 724 | this.zdFghData.newZdlist[this.selectIndex].fwlist.push({ |
705 | zbsm: node.label, | 725 | zbsm: node.label, |
... | @@ -744,7 +764,15 @@ | ... | @@ -744,7 +764,15 @@ |
744 | } | 764 | } |
745 | }, | 765 | }, |
746 | saveDz() { | 766 | saveDz() { |
747 | 767 | console.log(this.dzFghData,'dzFghData'); | |
768 | saveDzFg(this.dzFghData).then(res => { | ||
769 | if (res.success) { | ||
770 | Message.success("保存成功") | ||
771 | //TO DO 多幢分割完成后的操作 | ||
772 | } else { | ||
773 | Message.error("保存失败") | ||
774 | } | ||
775 | }) | ||
748 | }, | 776 | }, |
749 | saveH() { | 777 | saveH() { |
750 | 778 | ||
... | @@ -804,10 +832,19 @@ | ... | @@ -804,10 +832,19 @@ |
804 | case "zd": | 832 | case "zd": |
805 | this.zdFghData.newZdlist[index].djqbsm = ''; | 833 | this.zdFghData.newZdlist[index].djqbsm = ''; |
806 | this.zdFghData.newZdlist[index].djzqbsm = ''; | 834 | this.zdFghData.newZdlist[index].djzqbsm = ''; |
835 | getListByXzqbsm(id) | ||
836 | .then((res) => { | ||
837 | if (res.result == null) { | ||
838 | this.djq = null; | ||
839 | } else { | ||
840 | this.djq = res.result; | ||
841 | } | ||
842 | }) | ||
843 | .catch((error) => { | ||
844 | }); | ||
807 | break; | 845 | break; |
808 | case "dz": | 846 | case "dz": |
809 | this.dzFghData.newZdlist[index].djqbsm = ''; | 847 | //to do |
810 | this.dzFghData.newZdlist[index].djzqbsm = ''; | ||
811 | break; | 848 | break; |
812 | case "h": | 849 | case "h": |
813 | this.hFghData.newZdlist[index].djqbsm = ''; | 850 | this.hFghData.newZdlist[index].djqbsm = ''; |
... | @@ -816,18 +853,7 @@ | ... | @@ -816,18 +853,7 @@ |
816 | default: | 853 | default: |
817 | break; | 854 | break; |
818 | } | 855 | } |
819 | |||
820 | } | ||
821 | getListByXzqbsm(id) | ||
822 | .then((res) => { | ||
823 | if (res.result == null) { | ||
824 | this.djq = null; | ||
825 | } else { | ||
826 | this.djq = res.result; | ||
827 | } | 856 | } |
828 | }) | ||
829 | .catch((error) => { | ||
830 | }); | ||
831 | }, | 857 | }, |
832 | changeDjq(item, index) { | 858 | changeDjq(item, index) { |
833 | this.djzq = []; | 859 | this.djzq = []; |
... | @@ -866,19 +892,16 @@ | ... | @@ -866,19 +892,16 @@ |
866 | this.$set(this.zdFghData.newZdlist, this.zdFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData))) | 892 | this.$set(this.zdFghData.newZdlist, this.zdFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData))) |
867 | break | 893 | break |
868 | case 'dz': | 894 | case 'dz': |
869 | this.dzFghData.newZdlist.push({ | 895 | this.dzFghData.fwlist.push( |
870 | xzqbsm: "", | 896 | { |
871 | djqbsm: "", | 897 | "xmmc": this.dzFgqData.xmmc, |
872 | djzqbsm: "", | 898 | "zrzlist": [], |
873 | xmmc: "", | 899 | "zrzmclist": [], |
874 | syqlxbsm: "", | 900 | "ztype": "zrz" |
875 | zdtzmbsm: "", | 901 | } |
876 | userbsm: "", | 902 | ); |
877 | fwlist: [] | 903 | this.dzFghData.olddzbsm = this.dzFgqData.bsm; |
878 | }); | 904 | this.dzFgZrzList = this.dzFgqZrzData; |
879 | this.changeXzq(this.checkedData.xzqbsm) | ||
880 | this.changeDjq(this.checkedData.djqbsm) | ||
881 | this.$set(this.dzFghData.newZdlist, this.dzFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData))) | ||
882 | break | 905 | break |
883 | case 'h': | 906 | case 'h': |
884 | this.hFghData.newZdlist.push({ | 907 | this.hFghData.newZdlist.push({ |
... | @@ -905,7 +928,7 @@ | ... | @@ -905,7 +928,7 @@ |
905 | this.zdFghData.newZdlist.splice(index, 1); | 928 | this.zdFghData.newZdlist.splice(index, 1); |
906 | break; | 929 | break; |
907 | case "dz": | 930 | case "dz": |
908 | this.dzFghData.newZdlist.splice(index, 1); | 931 | this.dzFghData.fwlist.splice(index, 1); |
909 | break; | 932 | break; |
910 | case "h": | 933 | case "h": |
911 | this.hFghData.newZdlist.splice(index, 1); | 934 | this.hFghData.newZdlist.splice(index, 1); |
... | @@ -935,7 +958,7 @@ | ... | @@ -935,7 +958,7 @@ |
935 | default: | 958 | default: |
936 | break | 959 | break |
937 | } | 960 | } |
938 | 961 | console.log(this.dzFgqData,'this.dzFgqData'); | |
939 | }, | 962 | }, |
940 | }, | 963 | }, |
941 | computed: {}, | 964 | computed: {}, |
... | @@ -952,6 +975,7 @@ | ... | @@ -952,6 +975,7 @@ |
952 | handler: function (item) { | 975 | handler: function (item) { |
953 | this.dzFgqData.oldZdbsm = item.glbsm; | 976 | this.dzFgqData.oldZdbsm = item.glbsm; |
954 | this.getDzZdjbxx(item.glbsm); | 977 | this.getDzZdjbxx(item.glbsm); |
978 | this.dzfgGetZrzxx(item.glbsm) | ||
955 | }, | 979 | }, |
956 | deep: true | 980 | deep: true |
957 | }, | 981 | }, |
... | @@ -968,6 +992,9 @@ | ... | @@ -968,6 +992,9 @@ |
968 | this.changeDjq(item.djqbsm) | 992 | this.changeDjq(item.djqbsm) |
969 | }, | 993 | }, |
970 | deep: true | 994 | deep: true |
995 | }, | ||
996 | tabName(){ | ||
997 | this.tempBsmList = []; | ||
971 | } | 998 | } |
972 | } | 999 | } |
973 | } | 1000 | } | ... | ... |
-
Please register or sign in to post a comment