From ac754eb1132b24578258b908a719c2f2675681bc Mon Sep 17 00:00:00 2001 From: xiangxy Date: Fri, 8 Aug 2025 10:55:27 +0800 Subject: [PATCH] change --- pages/common/mater-list.vue | 2 +- pages/home/home.vue | 3 ++- pages/zw/jb-lower-mater.vue | 14 +++++++------- pages/zw/jb-return-mater.vue | 2 +- pages/zw/jb-up-mater.vue | 2 +- pages/zw/mancar-safe.vue | 8 ++++---- pages/zw/materbox-instore.vue | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue index 3eff11d..da775dd 100644 --- a/pages/common/mater-list.vue +++ b/pages/common/mater-list.vue @@ -97,7 +97,7 @@ // this.dataList = res.data this.totalCount = res.totalElements if (res.totalElements > 0) { - const dataMap = res.data + const dataMap = res.content this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap) this.reload = false } else { diff --git a/pages/home/home.vue b/pages/home/home.vue index d440281..09124b9 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -41,7 +41,8 @@ return { userName: '', menuList: [ - {title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶出入', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}, {title: '来料入库', path: '/pages/zw/ll-instore'}, {title: '空载具入库', path: '/pages/zw/kzj-instore'}, {title: '空载具出库', path: '/pages/zw/kzj-outstore'}, {title: '人工叫料', path: '/pages/zw/manual-callmater'}, {title: '人工退料', path: '/pages/zw/manual-returnmater'}, {title: '点位属性设置', path: '/pages/zw/point-attrset'}]}, + {title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶出入', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}, {title: '来料入库', path: '/pages/zw/ll-instore'}]}, + // {title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶出入', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}, {title: '来料入库', path: '/pages/zw/ll-instore'}, {title: '空载具入库', path: '/pages/zw/kzj-instore'}, {title: '空载具出库', path: '/pages/zw/kzj-outstore'}, {title: '人工叫料', path: '/pages/zw/manual-callmater'}, {title: '人工退料', path: '/pages/zw/manual-returnmater'}, {title: '点位属性设置', path: '/pages/zw/point-attrset'}]}, // {title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]}, // {title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]}, // {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]}, diff --git a/pages/zw/jb-lower-mater.vue b/pages/zw/jb-lower-mater.vue index ce25d95..4b2428d 100644 --- a/pages/zw/jb-lower-mater.vue +++ b/pages/zw/jb-lower-mater.vue @@ -1,6 +1,6 @@ @@ -199,7 +199,7 @@ let res = await getOrderList(this.index2, '2') if (res.code === '200') { // this.dataList = res.data - this.taskList = res.data.map(item => ({ + this.dataList = res.data.map(item => ({ ...item, workorder_status_name: this.statusMap[item.workorder_status] || '' })) @@ -252,13 +252,13 @@ } let res = await jbGetVehicleCode(this.index2) if (res.code === '200') { - this.val1 = res.data.tp_code + // this.val1 = res.data.tp_code this.val2 = res.data.lt_code } }, xlconfirm () { this.disabled = true - if (!this.index2 || !this.val3 || !this.val1 || !this.val2 || !this.pkId) { + if (!this.index2 || !this.val3 || !this.val2 || !this.pkId) { this.disabled = false return } diff --git a/pages/zw/jb-return-mater.vue b/pages/zw/jb-return-mater.vue index 3b53ae3..136ebff 100644 --- a/pages/zw/jb-return-mater.vue +++ b/pages/zw/jb-return-mater.vue @@ -167,7 +167,7 @@ let res = await getOrderList(this.index2, '2') if (res.code === '200') { // this.dataList = res.data - this.taskList = res.data.map(item => ({ + this.dataList = res.data.map(item => ({ ...item, workorder_status_name: this.statusMap[item.workorder_status] || '' })) diff --git a/pages/zw/jb-up-mater.vue b/pages/zw/jb-up-mater.vue index a167900..dc54ebc 100644 --- a/pages/zw/jb-up-mater.vue +++ b/pages/zw/jb-up-mater.vue @@ -161,7 +161,7 @@ let res = await getOrderList(this.index2, '1') if (res.code === '200') { // this.dataList = res.data - this.taskList = res.data.map(item => ({ + this.dataList = res.data.map(item => ({ ...item, workorder_status_name: this.statusMap[item.workorder_status] || '' })) diff --git a/pages/zw/mancar-safe.vue b/pages/zw/mancar-safe.vue index 990f240..e83c9c5 100644 --- a/pages/zw/mancar-safe.vue +++ b/pages/zw/mancar-safe.vue @@ -37,8 +37,8 @@ - - + + @@ -149,7 +149,7 @@ }, async _intoRegion () { this.disabled = true - if (!index || !pkId) { + if (!index) { this.disabled = false return } @@ -174,7 +174,7 @@ }, async _outRegion () { this.disabled2 = true - if (!index || !pkId) { + if (!index) { this.disabled2 = false return } diff --git a/pages/zw/materbox-instore.vue b/pages/zw/materbox-instore.vue index c79ff32..ede13c7 100644 --- a/pages/zw/materbox-instore.vue +++ b/pages/zw/materbox-instore.vue @@ -101,7 +101,7 @@ - +