diff --git a/src/views/zyjhzx/bfang/comps/BFangLJTable.vue b/src/views/zyjhzx/bfang/comps/BFangLJTable.vue index ca78c84..d1988f6 100644 --- a/src/views/zyjhzx/bfang/comps/BFangLJTable.vue +++ b/src/views/zyjhzx/bfang/comps/BFangLJTable.vue @@ -23,6 +23,7 @@ export default { gridOptions:{}, zyq:'', setInterval0:'', + active:false, } }, created(){ @@ -31,6 +32,10 @@ export default { this.gridOptions.height=this.$props.height this.gridOptions.columns = columns; this.zyq=this.$route.query.zyq + EventBus.$on('detailActive', params => { + console.log(params) + this.active=params + }) EventBus.$on('detailShow', params => { this.initData(params.ljList) }) @@ -40,10 +45,8 @@ export default { EventBus.$on('bfSave', params => { this.save() }) - }, methods:{ - save(){ const data=this.$refs.bFangRef.getCheckboxRecords() if (data.length>0){ @@ -63,6 +66,9 @@ export default { } }, pl(params){ + if (!this.active){ + return + } const data=this.$refs.bFangRef.getCheckboxRecords() if (data.length===0){ this.$message.warning('请选择需要批量处理的数据') @@ -74,6 +80,7 @@ export default { }) }, initData(list){ + this.active=true this.gridOptions.data=list } } diff --git a/src/views/zyjhzx/bfang/comps/BFangTable.vue b/src/views/zyjhzx/bfang/comps/BFangTable.vue index bd23dea..cb763a0 100644 --- a/src/views/zyjhzx/bfang/comps/BFangTable.vue +++ b/src/views/zyjhzx/bfang/comps/BFangTable.vue @@ -35,6 +35,14 @@ export default { this.bgong() }) }, + mounted(){ + EventBus.$on('pl', params => { + this.pl(params) + }) + EventBus.$on('bfSave', params => { + this.save() + }) + }, methods:{ bgong(){ const data=this.$refs.bFangRef.getCheckboxRecords() @@ -48,18 +56,22 @@ export default { showDetail({row}){ EventBus.$emit('detailShow', row) }, + pl(params){ + const data=this.$refs.bFangRef.getCheckboxRecords() + if (data.length>0){ + data.forEach(item=>{ + item.ljList.forEach(lj=>{ + lj.qq=params.qy + lj.dw=params.dw + }) + }) + } + }, save(){ const data=this.$refs.bFangRef.getCheckboxRecords() if(data.length >0){ const saveList=[] data.forEach(item=>{ - const data={ - id:item.id, - dcCh:item.dcCh, - dcPl:item.dcPl, - dcFd:item.dcFd, - ljList:[] - } item.ljList.filter(it=>!!it.qq&&!!it.dw).forEach(lj=>{ const _lj={ id:lj.id, @@ -67,9 +79,8 @@ export default { dw:lj.dw, ppzt:'02' } - data.ljList.push(_lj) + saveList.push(_lj) }) - saveList.push(data) }) ppBGong(saveList).then((res)=>{ this.$message.success('成功') @@ -86,12 +97,20 @@ export default { item.total=item.ljList.length||0 item.wbf=item.ljList.filter(it=>it.ppzt==='01').length item.ybf=item.total-item.wbf - for (const dw of this.dwxx) { - if (item.dwxxId === dw.id) { - item.qy = dw.qy - item.dwh = dw.dwh - } - } + + const dw=new Set() + item.ljList?.forEach(it=>{ + dw.add(it.dw||'') + }) + + item.dwh=[...dw].join(','); + + // for (const dw of this.dwxx) { + // if (item.dwxxId === dw.id) { + // item.qy = dw.qy + // item.dwh = dw.dwh + // } + // } }) this.gridOptions.data = res.data.filter(item => item.ljList.length > 0) }) diff --git a/src/views/zyjhzx/bfang/comps/PPComponent.vue b/src/views/zyjhzx/bfang/comps/PPComponent.vue index 3d5575f..94b7e36 100644 --- a/src/views/zyjhzx/bfang/comps/PPComponent.vue +++ b/src/views/zyjhzx/bfang/comps/PPComponent.vue @@ -1,6 +1,6 @@