From 8ec12543b8fe7a701be8c8fea3b5001d0a80ac2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Mon, 2 Dec 2024 16:24:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80=202.=E6=8A=9B?= =?UTF-8?q?=E4=B8=B8=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=86=85=E7=A0=81?= =?UTF-8?q?=E3=80=81=E8=B7=A8=E4=B8=BA=E3=80=81=E7=BB=84=E7=AB=8B=203.?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8A=9B=E4=B8=B8=E6=B4=BE=E5=B7=A5=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue | 11 ++-- src/views/zyjhzx/pwanpgong/comps/PwanSgd.vue | 22 +++++++- src/views/zyjhzx/pwanpgong/comps/pgdTable.js | 58 ++++++++++++++++---- src/views/zyjhzx/pwanpgong/index.vue | 2 +- src/views/zyjhzx/sliao/index.vue | 2 +- 5 files changed, 76 insertions(+), 19 deletions(-) diff --git a/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue b/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue index 4386ed7..c28df41 100644 --- a/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue +++ b/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue @@ -47,7 +47,10 @@ export default { } }) // this.gridOptions.data = this.list - this.showData(this.list) + this.showData(this.list,false) + EventBus.$emit('pwtgComp', { + flag:true + }) }) }, created(){ @@ -83,13 +86,13 @@ export default { } }, methods:{ - showData(list){ - if (this.tmpList.length===0){ + showData(list,flag=false){ + if (this.tmpList.length===0||flag){ this.tmpList=list } this.list=this.tmpList.filter(item=>item.zt==='BF') - this.gridOptions.data = this.list + this.gridOptions.data = this.list.reverse() }, // initData(){ // bgControl({}).then(res=>{ diff --git a/src/views/zyjhzx/pwanpgong/comps/PwanSgd.vue b/src/views/zyjhzx/pwanpgong/comps/PwanSgd.vue index 01a5f41..e65768b 100644 --- a/src/views/zyjhzx/pwanpgong/comps/PwanSgd.vue +++ b/src/views/zyjhzx/pwanpgong/comps/PwanSgd.vue @@ -33,6 +33,11 @@ export default { EventBus.$on('pwpg', item => { this.gridOptions.data.push(item) }) + EventBus.$on('pwtgComp', item => { + if (item.flag){ + // this.gridOptions.data = [] + } + }) }, created(){ const {options,columns,setExt}=paoWanPgdConfig(window.innerHeight*0.95) @@ -75,6 +80,7 @@ export default { }) }) } + this.gridOptions.data = [] }, export(){ @@ -102,6 +108,18 @@ export default { break; } } + for (const dw of this.gridOptions.tlt) { + if (item.kw===dw.bm){ + _item.垮位=dw.bmsm + break; + } + } + for (const dw of this.gridOptions.zl) { + if (item.zl===dw.bm){ + _item.组立=dw.name + break; + } + } printData.push(_item) }) const workBook = XLSX.utils.book_new(); @@ -122,8 +140,8 @@ export default { } data.push(item) }) - this.gridOptions.data=data - console.log(this.gridOptions.data) + this.gridOptions.data=data.reverse() + this.$refs.vxeGrid.setAllCheckboxRow(false); }, } } diff --git a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js index 0bdfd5b..ed96303 100644 --- a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js +++ b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js @@ -18,7 +18,26 @@ export default function (_height=0) { showOverflow: true, scrollY:{enable:true}, data:[], - ycldw:[] + ycldw:[], + tlt:[ + {"bmsm": "2跨超长超宽曲板", "bmlb": "QGKW", "bm": "10"}, + {"bmsm": "2跨T型材腹板", "bmlb": "QGKW", "bm": "11"}, + {"bmsm": "2跨激光切割板", "bmlb": "QGKW", "bm": "12"}, + {"bmsm": "3跨曲板", "bmlb": "QGKW", "bm": "13"}, + {"bmsm": "3跨厚板", "bmlb": "QGKW", "bm": "14"}, + {"bmsm": "4跨普通板", "bmlb": "QGKW", "bm": "15"}, + {"bmsm": "7跨型板", "bmlb": "QGKW", "bm": "16"}, + {"bmsm": "光电", "bmlb": "QGKW", "bm": "17"}, + {"bmsm": "2跨T型材面板", "bmlb": "QGKW", "bm": "5"}, + {"bmsm": "3跨平铁", "bmlb": "QGKW", "bm": "6"}, + {"bmsm": "1跨平直大板", "bmlb": "QGKW", "bm": "7"}, + {"bmsm": "1跨进线板", "bmlb": "QGKW", "bm": "8"}, + {"bmsm": "2跨超长超宽板", "bmlb": "QGKW", "bm": "9"} + ], + zl:[ + {"name": "小组立", "bm": "1010"}, + {"name": "中大组立", "bm": "1110"}, + ] } const ext={} const setExt=function (key,value){ @@ -48,19 +67,36 @@ export default function (_height=0) { } } } + const kwFormat=function ({cellValue}){ + for (const item of options.tlt) { + if (cellValue===item.bm){ + return item.bmsm + } + } + } + + const zlFormat=function ({cellValue}){ + for (const item of options.zl) { + if (cellValue===item.bm){ + return item.name + } + } + } const columns = [ { type: 'checkbox', width: 40 }, - { type: 'seq',title:'序号', width: 60 }, + { type: 'seq',title:'序号', width: 50 }, {field: 'dwId', title: '垛位', width: 100,formatter: dwFormat}, - {field: 'ceng', title: '层数', width: 60}, - {field: 'czbh', title: '船号'}, - {field: 'pl', title: '批量'}, - {field: 'fd', title: '分段',visible:false}, - {field: 'tlth', title: '套料图号',visible:false}, - {field: 'wpgg', title: '物品规格', }, - {field: 'wlh', title: '物料号', }, - {field: 'nm', title: '内码',visible:false }, - {field: '', title: '备注',visible:false }, + {field: 'ceng', title: '层数', width: 50}, + {field: 'czbh', title: '船号', width: 80}, + {field: 'pl', title: '批量', width: 50}, + {field: 'fd', title: '分段',width: 50,visible:false}, + {field: 'tlth', title: '套料图号',width: 120,visible:false}, + {field: 'wpgg', title: '物品规格', width: 120,}, + {field: 'wlh', title: '物料号', width: 130,}, + {field: 'kw', title: '垮位',width: 130,formatter: kwFormat}, + {field: 'zl', title: '组立', width: 70,formatter: zlFormat}, + {field: 'nbsbm', title: '入库批号',minWidth: 100,}, + {field: '', title: '备注',width: 50,visible:false }, ] return { diff --git a/src/views/zyjhzx/pwanpgong/index.vue b/src/views/zyjhzx/pwanpgong/index.vue index db14170..a422348 100644 --- a/src/views/zyjhzx/pwanpgong/index.vue +++ b/src/views/zyjhzx/pwanpgong/index.vue @@ -141,7 +141,7 @@ export default { const item=res.data[i] const dwGroup=dw(i,item) dwGroup.on('click tap',function (){ - that.$refs.pwpgd.showData(item.list) + that.$refs.pwpgd.showData(item.list,true) }) group.add(dwGroup) } diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue index f2fe0fc..6c5312f 100644 --- a/src/views/zyjhzx/sliao/index.vue +++ b/src/views/zyjhzx/sliao/index.vue @@ -390,7 +390,7 @@ export default { sljhrq:item.sljhrq, qgjhrq:item.qgjhrq, wlh:item.slwlh, - nm:item.nm, + nbsbm:item.nbsbm, bfr:that.getCurrentWorker()?.userCode, type:'YCL' } From c3f009e9c16d6faad85e4eb174bf80c8c9cb465c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 3 Dec 2024 10:05:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E6=8A=9B=E4=B8=B8=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=AA=E6=97=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8C=89=E9=92=AE=202.=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2,=E5=8F=96=E6=B6=88=E7=9B=91=E5=90=AC=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A4=A7=E5=B0=8F=E5=8F=98=E5=8C=96=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jhzxgl/pwjhD.vue | 1 + src/views/zyjhzx/hxianfkui/index.vue | 2 +- src/views/zyjhzx/hxianpgong/index.vue | 2 +- src/views/zyjhzx/lliaofkui/index.vue | 2 +- src/views/zyjhzx/lliaopgong/index.vue | 2 +- src/views/zyjhzx/pwanfkui/index.vue | 2 +- src/views/zyjhzx/pwanpgong/index.vue | 2 +- src/views/zyjhzx/qgefkui/index.vue | 2 +- src/views/zyjhzx/qgepgong/index.vue | 2 +- src/views/zyjhzx/sliao/index.vue | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue index 90cd2ae..dd4078e 100644 --- a/src/views/jhzxgl/pwjhD.vue +++ b/src/views/jhzxgl/pwjhD.vue @@ -118,6 +118,7 @@ 批量 + 出库处理 diff --git a/src/views/zyjhzx/hxianfkui/index.vue b/src/views/zyjhzx/hxianfkui/index.vue index 12afe18..6c920d6 100644 --- a/src/views/zyjhzx/hxianfkui/index.vue +++ b/src/views/zyjhzx/hxianfkui/index.vue @@ -55,7 +55,7 @@ export default { this.initKonvaStage(); }, created(){ - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{}, methods:{ diff --git a/src/views/zyjhzx/hxianpgong/index.vue b/src/views/zyjhzx/hxianpgong/index.vue index c3ffa36..c65ed47 100644 --- a/src/views/zyjhzx/hxianpgong/index.vue +++ b/src/views/zyjhzx/hxianpgong/index.vue @@ -55,7 +55,7 @@ export default { created(){ this.zyq=this.$route.query.zyq this.deviceId=this.$route.query.deviceId||'' - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{}, methods:{ diff --git a/src/views/zyjhzx/lliaofkui/index.vue b/src/views/zyjhzx/lliaofkui/index.vue index 2fcaa88..35368c6 100644 --- a/src/views/zyjhzx/lliaofkui/index.vue +++ b/src/views/zyjhzx/lliaofkui/index.vue @@ -75,7 +75,7 @@ export default { }, created(){ this.deviceId=this.$route.query.deviceId||'' - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{ zyjhzx(data){ diff --git a/src/views/zyjhzx/lliaopgong/index.vue b/src/views/zyjhzx/lliaopgong/index.vue index 754c938..5222af1 100644 --- a/src/views/zyjhzx/lliaopgong/index.vue +++ b/src/views/zyjhzx/lliaopgong/index.vue @@ -42,7 +42,7 @@ export default { this.initKonvaStage(); }, created(){ - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{}, methods:{ diff --git a/src/views/zyjhzx/pwanfkui/index.vue b/src/views/zyjhzx/pwanfkui/index.vue index 106abff..78a142d 100644 --- a/src/views/zyjhzx/pwanfkui/index.vue +++ b/src/views/zyjhzx/pwanfkui/index.vue @@ -55,7 +55,7 @@ export default { this.initKonvaStage(); }, created(){ - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{}, methods:{ diff --git a/src/views/zyjhzx/pwanpgong/index.vue b/src/views/zyjhzx/pwanpgong/index.vue index a422348..04c83e4 100644 --- a/src/views/zyjhzx/pwanpgong/index.vue +++ b/src/views/zyjhzx/pwanpgong/index.vue @@ -61,7 +61,7 @@ export default { created(){ this.zyq=this.$route.query.zyq this.deviceId=this.$route.query.deviceId||'' - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{ slComplete(){ diff --git a/src/views/zyjhzx/qgefkui/index.vue b/src/views/zyjhzx/qgefkui/index.vue index 29e7665..f253929 100644 --- a/src/views/zyjhzx/qgefkui/index.vue +++ b/src/views/zyjhzx/qgefkui/index.vue @@ -57,7 +57,7 @@ export default { this.initKonvaStage(); }, created(){ - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{}, methods: { diff --git a/src/views/zyjhzx/qgepgong/index.vue b/src/views/zyjhzx/qgepgong/index.vue index f394d6f..89e5652 100644 --- a/src/views/zyjhzx/qgepgong/index.vue +++ b/src/views/zyjhzx/qgepgong/index.vue @@ -56,7 +56,7 @@ export default { created(){ this.zyq=this.$route.query.zyq this.deviceId=this.$route.query.deviceId||'' - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{}, methods:{ diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue index 6c5312f..9a365c6 100644 --- a/src/views/zyjhzx/sliao/index.vue +++ b/src/views/zyjhzx/sliao/index.vue @@ -60,7 +60,7 @@ export default { this.initTlt() }, created(){ - window.addEventListener('resize', this.initKonvaStage) + // window.addEventListener('resize', this.initKonvaStage) }, sockets:{}, methods:{ From 32425bfe59aaa39393a8d06e359e50468d65659f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 3 Dec 2024 10:20:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=202.=E4=BF=AE=E5=A4=8D=E5=A5=97=E6=96=99?= =?UTF-8?q?=E5=9B=BE=E5=88=97=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jhzxgl/pwjhD.vue | 2 +- src/views/zyjhzx/pwanpgong/comps/pgdTable.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue index dd4078e..3ae3b62 100644 --- a/src/views/jhzxgl/pwjhD.vue +++ b/src/views/jhzxgl/pwjhD.vue @@ -118,7 +118,7 @@ 批量 - 出库处理 + 出库处理 diff --git a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js index ed96303..954439c 100644 --- a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js +++ b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js @@ -90,7 +90,7 @@ export default function (_height=0) { {field: 'czbh', title: '船号', width: 80}, {field: 'pl', title: '批量', width: 50}, {field: 'fd', title: '分段',width: 50,visible:false}, - {field: 'tlth', title: '套料图号',width: 120,visible:false}, + {field: 'tlth', title: '套料图号',width: 120}, {field: 'wpgg', title: '物品规格', width: 120,}, {field: 'wlh', title: '物料号', width: 130,}, {field: 'kw', title: '垮位',width: 130,formatter: kwFormat},