diff --git a/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue b/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue index 0dae6b1..7e74712 100644 --- a/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue +++ b/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue @@ -34,7 +34,7 @@ export default { return } //工单号尾号长度 - const djhWhLengh=3 + const djhWhLengh=4 const tmpList=this.list.filter(item=>item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber) if (tmpList.length>1){ this.list=tmpList @@ -42,7 +42,9 @@ export default { return } for (const item of this.list) { + console.log(item.plxh?.slice(-djhWhLengh)) if (item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber){ + console.log(item) this.paigong0(item) break } @@ -66,7 +68,7 @@ export default { bgControl({}).then(res=>{ const gx=res.data||'1' const data={ - zt:'42', + zt:'32', wgzt:'52', wclzt:'51', zyq:this.zyq diff --git a/src/views/zyjhzx/pwanfkui/index.vue b/src/views/zyjhzx/pwanfkui/index.vue index 78a142d..b17961d 100644 --- a/src/views/zyjhzx/pwanfkui/index.vue +++ b/src/views/zyjhzx/pwanfkui/index.vue @@ -75,6 +75,7 @@ export default { this.pgdGroup.add(group) }, pgdClick(option){ + console.log(option) const children=this.dwGroup.find('Group') let index=-1 let dw=null @@ -86,13 +87,13 @@ export default { } } - children[index].selected() + !!dw&&children[index].selected() this.initDwInfo(index,dw) const that=this this.slGroup.children.forEach(item=>{ const data=item.getAttr('item') - if (data.czbh===option.dcCh&&data.pl===option.dcPl&&data.fd===option.dcFd&&data.tlth===option.tzbh){ + if (data.czbh===option.dcCh&&data.pl===option.dcPl&&data.tlth===option.tzbh){ const imageObj = new Image(); imageObj.src = require('@/assets/pwan/gbSelectBg.png'); imageObj.onload = function () { diff --git a/src/views/zyjhzx/pwanpgong/index.vue b/src/views/zyjhzx/pwanpgong/index.vue index c06d871..db7efec 100644 --- a/src/views/zyjhzx/pwanpgong/index.vue +++ b/src/views/zyjhzx/pwanpgong/index.vue @@ -128,9 +128,7 @@ export default { if (this.dwGroup){ this.dwGroup.destroyChildren() } - getYcldw({type:'ycl'}).then(res=>{ - console.log(res) - + getYcldw({type:'ycl',lx:'BF'}).then(res=>{ const {container,dw}=drawDw(this.width,this.height) const {bgGroup,group}=container() this.dwGroup=group; diff --git a/src/views/zyjhzx/qgepgong/comps/QgePgd.vue b/src/views/zyjhzx/qgepgong/comps/QgePgd.vue index c8af399..ea07b1d 100644 --- a/src/views/zyjhzx/qgepgong/comps/QgePgd.vue +++ b/src/views/zyjhzx/qgepgong/comps/QgePgd.vue @@ -25,6 +25,7 @@ export default { gridOptions:{}, list:{}, setExt:null, + zyq:null, } }, sockets:{ @@ -33,7 +34,7 @@ export default { return } //工单号尾号长度 - const djhWhLengh=3 + const djhWhLengh=4 const tmpList=this.list.filter(item=>item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber) if (tmpList.length>1){ this.list=tmpList @@ -54,6 +55,7 @@ export default { this.gridOptions=options this.gridOptions.columns=columns this.setExt('workers',this.$props.workers) + this.zyq=this.$route.query.zyq getDw({type:'llj'}).then(res=>{ this.gridOptions.ycldw=res.data }) @@ -63,6 +65,7 @@ export default { bgControl({}).then(res=>{ const gx=res.data||'1' const data={ + zyq:this.zyq, zt:'52', wgzt:'62', wclzt:'61' diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue index 73c0a3d..a1b7a74 100644 --- a/src/views/zyjhzx/sliao/index.vue +++ b/src/views/zyjhzx/sliao/index.vue @@ -86,6 +86,8 @@ export default { return; } + console.log(this.currentDw) + const currentWorker=this.getCurrentWorker() if (!currentWorker){ this.$message.warning('请选择报工人') @@ -94,6 +96,9 @@ export default { for (const item of this.list) { index+=1 if (item.djh===data.msg.orderNumber||item.djh?.slice(-djhWhLengh)===data.msg.orderNumber){ + item.slycldw=this.currentDw.id + item.slyclcs=this.dw[this.currentDwIndex].list.length+1 + item.slfkry=currentWorker.userCode const data={ ydjh:item, ydid:item.id,