root/hht-zzzw-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
xiangxy
2025-08-08 10:55:27 +08:00
parent b471d437cb
commit ac754eb113
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/common/mater-list.vue
View File

@@ -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 {

3
pages/home/home.vue
View File

@@ -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'}]},

14
pages/zw/jb-lower-mater.vue
View File

@@ -1,6 +1,6 @@
<template>
<view class="zd_container">
<!-- 解包退料 -->
<!-- 解包下料 -->
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
@@ -30,14 +30,14 @@
</view>
<button class="mini-btn" type="primary" size="mini" @tap="_getWeight">获取重量</button>
</view>
<view class="zd-row border-bottom">
<!-- <view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">托盘编码</span>
</view>
<view class="zd-col-17">
<search-box v-model="val1"/>
</view>
</view>
</view> -->
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">料桶编码</span>
@@ -86,7 +86,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index2}" @tap="seachList">查询工单</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index2 || !this.val3 || !this.val1 || !this.val2 || !this.pkId}" @tap="xlconfirm">确认下料</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !this.index2 || !this.val3 || !this.val2 || !this.pkId}" @tap="xlconfirm">确认下料</button>
</view>
</view>
</template>
@@ -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
}

2
pages/zw/jb-return-mater.vue
View File

@@ -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] || ''
}))

2
pages/zw/jb-up-mater.vue
View File

@@ -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] || ''
}))

8
pages/zw/mancar-safe.vue
View File

@@ -37,8 +37,8 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" @tap="seachList">刷新</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !index || !pkId}" @tap="_intoRegion">进入区域</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !index || !pkId}" @tap="_outRegion">退出区域</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" @tap="_intoRegion">进入区域</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !index}" @tap="_outRegion">退出区域</button>
</view>
</view>
</template>
@@ -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
}

2
pages/zw/materbox-instore.vue
View File

@@ -101,7 +101,7 @@
</view>
<view class="zd-row submit-bar">
<!-- <button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_checkStruct">检查站点</button> -->
<button class="zd-col-7 button-primary" :class="{'button-info': !val2}" :disabled="disabled" @tap="_checkStruct">刷新数据</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val2}" :disabled="disabled" @tap="_jbGetLtInfo">刷新数据</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled3" @tap="_checkStruct">空桶取出</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || flag === '2'}" :disabled="disabled2" @tap="_confirmSet">确认放置</button>
</view>