1.各种调整

master
董哲奇 5 months ago
parent 8156c52a83
commit 34efee31bd

@ -34,7 +34,7 @@ export default {
return 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) const tmpList=this.list.filter(item=>item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber)
if (tmpList.length>1){ if (tmpList.length>1){
this.list=tmpList this.list=tmpList
@ -42,7 +42,9 @@ export default {
return return
} }
for (const item of this.list) { 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){ if (item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber){
console.log(item)
this.paigong0(item) this.paigong0(item)
break break
} }
@ -66,7 +68,7 @@ export default {
bgControl({}).then(res=>{ bgControl({}).then(res=>{
const gx=res.data||'1' const gx=res.data||'1'
const data={ const data={
zt:'42', zt:'32',
wgzt:'52', wgzt:'52',
wclzt:'51', wclzt:'51',
zyq:this.zyq zyq:this.zyq

@ -75,6 +75,7 @@ export default {
this.pgdGroup.add(group) this.pgdGroup.add(group)
}, },
pgdClick(option){ pgdClick(option){
console.log(option)
const children=this.dwGroup.find('Group') const children=this.dwGroup.find('Group')
let index=-1 let index=-1
let dw=null let dw=null
@ -86,13 +87,13 @@ export default {
} }
} }
children[index].selected() !!dw&&children[index].selected()
this.initDwInfo(index,dw) this.initDwInfo(index,dw)
const that=this const that=this
this.slGroup.children.forEach(item=>{ this.slGroup.children.forEach(item=>{
const data=item.getAttr('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(); const imageObj = new Image();
imageObj.src = require('@/assets/pwan/gbSelectBg.png'); imageObj.src = require('@/assets/pwan/gbSelectBg.png');
imageObj.onload = function () { imageObj.onload = function () {

@ -128,9 +128,7 @@ export default {
if (this.dwGroup){ if (this.dwGroup){
this.dwGroup.destroyChildren() this.dwGroup.destroyChildren()
} }
getYcldw({type:'ycl'}).then(res=>{ getYcldw({type:'ycl',lx:'BF'}).then(res=>{
console.log(res)
const {container,dw}=drawDw(this.width,this.height) const {container,dw}=drawDw(this.width,this.height)
const {bgGroup,group}=container() const {bgGroup,group}=container()
this.dwGroup=group; this.dwGroup=group;

@ -25,6 +25,7 @@ export default {
gridOptions:{}, gridOptions:{},
list:{}, list:{},
setExt:null, setExt:null,
zyq:null,
} }
}, },
sockets:{ sockets:{
@ -33,7 +34,7 @@ export default {
return 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) const tmpList=this.list.filter(item=>item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber)
if (tmpList.length>1){ if (tmpList.length>1){
this.list=tmpList this.list=tmpList
@ -54,6 +55,7 @@ export default {
this.gridOptions=options this.gridOptions=options
this.gridOptions.columns=columns this.gridOptions.columns=columns
this.setExt('workers',this.$props.workers) this.setExt('workers',this.$props.workers)
this.zyq=this.$route.query.zyq
getDw({type:'llj'}).then(res=>{ getDw({type:'llj'}).then(res=>{
this.gridOptions.ycldw=res.data this.gridOptions.ycldw=res.data
}) })
@ -63,6 +65,7 @@ export default {
bgControl({}).then(res=>{ bgControl({}).then(res=>{
const gx=res.data||'1' const gx=res.data||'1'
const data={ const data={
zyq:this.zyq,
zt:'52', zt:'52',
wgzt:'62', wgzt:'62',
wclzt:'61' wclzt:'61'

@ -86,6 +86,8 @@ export default {
return; return;
} }
console.log(this.currentDw)
const currentWorker=this.getCurrentWorker() const currentWorker=this.getCurrentWorker()
if (!currentWorker){ if (!currentWorker){
this.$message.warning('请选择报工人') this.$message.warning('请选择报工人')
@ -94,6 +96,9 @@ export default {
for (const item of this.list) { for (const item of this.list) {
index+=1 index+=1
if (item.djh===data.msg.orderNumber||item.djh?.slice(-djhWhLengh)===data.msg.orderNumber){ 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={ const data={
ydjh:item, ydjh:item,
ydid:item.id, ydid:item.id,

Loading…
Cancel
Save