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] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AF=AD=E9=9F=B3=E6=9C=8D?=
=?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80=202.=E6=8A=9B=E4=B8=B8?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=86=85=E7=A0=81=E3=80=81?=
=?UTF-8?q?=E8=B7=A8=E4=B8=BA=E3=80=81=E7=BB=84=E7=AB=8B=203.=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3=E6=8A=9B=E4=B8=B8=E6=B4=BE=E5=B7=A5=E7=89=A9=E6=96=99?=
=?UTF-8?q?=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'
}