pda界面和功能优化，完善mes下发版辊字段
This commit is contained in:
Lenovo
@@ -68,21 +68,25 @@
|
||||
<text class="info-label">物料名称</text>
|
||||
<text class="info-value">{{ currentMaterial.productName }}</text>
|
||||
</view> -->
|
||||
<view class="info-row">
|
||||
<text class="info-label">子单号</text>
|
||||
<text class="info-value">{{ currentMaterial.stockinDetailId }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">辊号</text>
|
||||
<text class="info-value">{{ currentMaterial.rollerNumber }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">产品名称</text>
|
||||
<text class="info-value">{{ currentMaterial.productName }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">颜色</text>
|
||||
<text class="info-value">{{ currentMaterial.color }}</text>
|
||||
<text class="info-label">版长</text>
|
||||
<text class="info-value">{{ currentMaterial.length }}</text>
|
||||
</view>
|
||||
<!-- <view class="info-row">
|
||||
<text class="info-label">色序</text>
|
||||
<text class="info-value">{{ currentMaterial.colorSequence }}</text>
|
||||
</view> -->
|
||||
<view class="info-row">
|
||||
<text class="info-label">子单号</text>
|
||||
<text class="info-value">{{ currentMaterial.stockinDetailId }}</text>
|
||||
<view class="info-row">
|
||||
<text class="info-label">版周</text>
|
||||
<text class="info-value">{{ currentMaterial.perimeter }}</text>
|
||||
</view>
|
||||
<view class="form-item">
|
||||
<text class="form-label">绑定数量</text>
|
||||
@@ -114,17 +118,17 @@
|
||||
<text class="item-label">辊号</text>
|
||||
<text class="item-value">{{ item.rollerNumber }}</text>
|
||||
</view>
|
||||
<!-- <view class="item-row">
|
||||
<text class="item-label">色序</text>
|
||||
<text class="item-value">{{ item.colorSequence }}</text>
|
||||
</view> -->
|
||||
<view class="item-row">
|
||||
<text class="item-label">颜色</text>
|
||||
<text class="item-value">{{ item.color }}</text>
|
||||
<view class="item-row">
|
||||
<text class="item-label">产品名称</text>
|
||||
<text class="item-value">{{ item.productName }}</text>
|
||||
</view>
|
||||
<view class="item-row">
|
||||
<text class="item-label">规格</text>
|
||||
<text class="item-value">{{ item.spec }}</text>
|
||||
<text class="item-label">版长</text>
|
||||
<text class="item-value">{{ item.length }}</text>
|
||||
</view>
|
||||
<view class="item-row">
|
||||
<text class="item-label">版周</text>
|
||||
<text class="item-value">{{ item.perimeter }}</text>
|
||||
</view>
|
||||
<view class="item-row">
|
||||
<text class="item-label">绑定数量</text>
|
||||
@@ -157,7 +161,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getMaterialByDetailId, getMaterialByRollerNumber, submitBindTray, submitBindTrayMsg, submitAddInJob, getInboundStockList, getDetailList } from '@/api/warehouse/inbound'
|
||||
import { getMaterialByDetailId, getMaterialByRollerNumber, submitBindTray, submitBindTrayMsg, submitAddInJob, getInboundStockList, getDetailList } from '@/api/warehouse/inbound/bindTray'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@@ -556,7 +560,7 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 20rpx 0;
|
||||
padding: 10rpx 0;
|
||||
border: none;
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getMaterialByDetailId, getTrayMsgByRollerNumber, submitCancelTray, submitCancelTrayMsg } from '@/api/warehouse/inbound'
|
||||
import { getMaterialByDetailId, getTrayMsgByRollerNumber, submitCancelTrayMsg } from '@/api/warehouse/inbound/cancelBindTrayByRoller'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
424
pda/pages/warehouse/inbound/cancelBindTrayByTrayCode.vue
Normal file
424
pda/pages/warehouse/inbound/cancelBindTrayByTrayCode.vue
Normal file
@@ -0,0 +1,424 @@
|
||||
<template>
|
||||
<view class="page-container">
|
||||
<!-- 任务信息 -->
|
||||
<view class="task-info" v-if="taskNo">
|
||||
<text class="task-label">出库任务编号</text>
|
||||
<text class="task-value">{{ taskNo }}</text>
|
||||
</view>
|
||||
|
||||
<!-- 扫码区域 -->
|
||||
<view class="scan-section">
|
||||
<view class="scan-header">
|
||||
<text class="scan-title">扫描绑定托盘条码</text>
|
||||
<view class="scan-btn" @click="startScan">
|
||||
<uni-icons type="scan" size="18" color="#fa8c16"></uni-icons>
|
||||
<text class="scan-btn-text orange">扫码</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="input-wrap">
|
||||
<input class="scan-input" v-model="barcode" placeholder="请输入或扫描托盘条码"
|
||||
@confirm="handleBarcode" focus />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 出库信息 -->
|
||||
<view class="form-section" v-for="(item, index) in inTrayMsgList" :key="index">
|
||||
<view class="scan-header">
|
||||
<text class="scan-title">绑定信息</text>
|
||||
<view class="info-btn">
|
||||
<button class="scan-btn-text red" @click="submitCancelTrayAction(item)">确认取消</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">版辊编号</text>
|
||||
<text class="info-value">{{ item.rollerNumber }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">产品名称</text>
|
||||
<text class="info-value">{{ item.productName }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">版长</text>
|
||||
<text class="info-value">{{ item.length }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">版周</text>
|
||||
<text class="info-value">{{ item.perimeter }}</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<!-- 操作按钮 -->
|
||||
<view class="btn-section" >
|
||||
<button class="btn btn-orange" v-if="inTrayMsgList" @click="cancelBindTrayMsgsAll">取消全部</button>
|
||||
<button class="btn btn-default" @click="resetForm">重置</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getTrayCodeDetail } from '@/api/warehouse/inbound/cancelBindTrayByTrayCode'
|
||||
import { cancelTrayMsg } from '@/api/warehouse/inbound/cancelBindTrayByTrayCode'
|
||||
import { cancelTrayMsgAllByTrayCode } from '@/api/warehouse/inbound/cancelBindTrayByTrayCode'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
taskNo: '',
|
||||
barcode: '',
|
||||
traCode: '',
|
||||
outInventoryInfo: null,
|
||||
inTrayMsgList: [],
|
||||
|
||||
confirmQty: '',
|
||||
form: {
|
||||
remark: ''
|
||||
},
|
||||
|
||||
productDetailStatusMap: {
|
||||
1: '正常',
|
||||
2: '异常产品',
|
||||
},
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
if (options.taskNo) {
|
||||
this.taskNo = options.taskNo
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
startScan() {
|
||||
var that = this
|
||||
uni.scanCode({
|
||||
onlyFromCamera: false,
|
||||
scanType: ['barCode', 'qrCode'],
|
||||
success: function(res) {
|
||||
that.barcode = res.result
|
||||
that.handleBarcode()
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
handleBarcode() {
|
||||
if (!this.barcode) {
|
||||
this.$modal.msg('请输入托盘条码')
|
||||
return
|
||||
}
|
||||
|
||||
var that = this
|
||||
// var params = { taskNo: this.taskNo, barcode: this.barcode }
|
||||
var params = { barcode: this.barcode }
|
||||
|
||||
getTrayCodeDetail(this.barcode).then(function(res) {
|
||||
if (Array.isArray(res.data)) {
|
||||
that.inTrayMsgList = res.data
|
||||
} else if (res.data) {
|
||||
that.inTrayMsgList = [res.data]
|
||||
} else {
|
||||
that.inTrayMsgList = []
|
||||
}
|
||||
|
||||
if (that.inTrayMsgList.length > 0) {
|
||||
that.$modal.msgSuccess('获取到 ' + that.inTrayMsgList.length + ' 条绑定信息')
|
||||
} else {
|
||||
that.$modal.msg('未找到该托盘信息')
|
||||
}
|
||||
}).catch(function() {
|
||||
that.inTrayMsgList = []
|
||||
that.$modal.msg('找不到托盘明细信息，可能是任务类型不符或已确认出库完成')
|
||||
})
|
||||
},
|
||||
|
||||
// 取消版辊绑定信息
|
||||
submitCancelTrayAction(item) {
|
||||
// 构造你需要的参数
|
||||
var params = {
|
||||
barcode: item.rollerNumber,
|
||||
productStatus: item.productStatus
|
||||
}
|
||||
|
||||
uni.showLoading({ title: '提交中...' })
|
||||
// TODO: 替换为你实际的后端确认接口
|
||||
cancelTrayMsg(params).then(res => {
|
||||
uni.hideLoading()
|
||||
this.$modal.msgSuccess('版辊 ' + item.rollerNumber + ' 绑盘信息已取消')
|
||||
// 可选：出库成功后从列表中移除该项，避免重复点击
|
||||
this.inTrayMsgList = this.inTrayMsgList.filter(i => i.rollerNumber !== item.rollerNumber)
|
||||
}).catch(err => {
|
||||
// uni.hideLoading()
|
||||
// this.$modal.msg('出库失败', err)
|
||||
})
|
||||
},
|
||||
|
||||
//托盘物料盘点完成确认回流
|
||||
cancelBindTrayMsgsAll() {
|
||||
if (!this.barcode) {
|
||||
this.$modal.msg('请输入托盘号')
|
||||
return
|
||||
}
|
||||
|
||||
var data = {
|
||||
// taskNo: this.taskNo,
|
||||
barcode: this.barcode,
|
||||
}
|
||||
|
||||
// console.log(this.barcode)
|
||||
|
||||
this.$modal.confirm('取消全部操作会将该托盘所有版辊绑定信息移除，确认执行吗？后续你仍然可以重新进行绑定操作').then(() => {
|
||||
cancelTrayMsgAllByTrayCode(data).then(() => {
|
||||
this.$modal.msgSuccess(this.barcode + '托盘绑定信息已全部取消，可继续执行绑定操作')
|
||||
this.inTrayMsgList = []
|
||||
this.resetForm()
|
||||
}).catch(() => {
|
||||
// 全局拦截器通常已处理错误弹窗，这里可只处理状态重置
|
||||
// console.log('出库确认失败')
|
||||
})
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess(this.barcode + '取消成功');
|
||||
this.inTrayMsgList = []
|
||||
this.resetForm();
|
||||
}).catch(() => {
|
||||
// 全局拦截器通常已处理错误弹窗，这里可只处理状态重置
|
||||
// console.log('出库确认失败或用户取消')
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
resetForm() {
|
||||
this.barcode = ''
|
||||
this.outInventoryInfo = null
|
||||
this.inTrayMsgList = []
|
||||
this.confirmQty = ''
|
||||
this.form = {
|
||||
remark: ''
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #f5f7fa;
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
.page-container {
|
||||
padding: 24rpx;
|
||||
}
|
||||
|
||||
.task-info {
|
||||
background: #fff7e6;
|
||||
border-radius: 12rpx;
|
||||
padding: 20rpx 24rpx;
|
||||
margin-bottom: 24rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.task-label {
|
||||
font-size: 26rpx;
|
||||
color: #fa8c16;
|
||||
}
|
||||
|
||||
.task-value {
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.scan-section {
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
padding: 28rpx;
|
||||
margin-bottom: 24rpx;
|
||||
box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
|
||||
.scan-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.scan-title {
|
||||
font-size: 30rpx;
|
||||
font-weight: 500;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.scan-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 8rpx 20rpx;
|
||||
border: 1rpx solid #fa8c16;
|
||||
border-radius: 8rpx;
|
||||
}
|
||||
|
||||
.scan-btn-text {
|
||||
font-size: 24rpx;
|
||||
margin-left: 8rpx;
|
||||
}
|
||||
|
||||
.scan-btn-text.orange {
|
||||
color: #fa8c16;
|
||||
}
|
||||
|
||||
.scan-btn-text.green {
|
||||
color: #fff;
|
||||
background-color: #00aa00;
|
||||
}
|
||||
|
||||
.scan-btn-text.red {
|
||||
color: #fff;
|
||||
background-color: #ef494c;
|
||||
}
|
||||
|
||||
.input-wrap {
|
||||
border: 1rpx solid #e8e8e8;
|
||||
border-radius: 8rpx;
|
||||
padding: 4rpx;
|
||||
}
|
||||
|
||||
.scan-input {
|
||||
font-size: 28rpx;
|
||||
padding: 16rpx;
|
||||
word-break: break-all;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.form-section {
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
padding: 28rpx;
|
||||
margin-bottom: 24rpx;
|
||||
box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
|
||||
.form-title {
|
||||
font-size: 30rpx;
|
||||
font-weight: 500;
|
||||
color: #333;
|
||||
margin-bottom: 24rpx;
|
||||
padding-bottom: 16rpx;
|
||||
border-bottom: 1rpx solid #f0f0f0;
|
||||
}
|
||||
|
||||
.form-section-input {
|
||||
flex: 1;
|
||||
font-size: 28rpx; /* ✅ 关键：字体大小必须与 label 一致 */
|
||||
color: #333;
|
||||
text-align: right; /* ✅ 关键：内容靠右对齐 */
|
||||
height: 28rpx; /* ✅ 关键：明确设置高度 */
|
||||
line-height: 28rpx; /* ✅ 关键：行高必须与 label 完全一致，解决多端对齐差异 */
|
||||
padding: 0; /* ✅ 关键：清除 input 默认的 padding，防止错位 */
|
||||
margin: 0; /* 清除默认 margin */
|
||||
border: none; /* 如果需要无边框效果 */
|
||||
}
|
||||
|
||||
.form-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 16rpx 0;
|
||||
}
|
||||
|
||||
.form-label {
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
width: 160rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.form-input {
|
||||
flex: 1;
|
||||
font-size: 28rpx;
|
||||
border: 1rpx solid #e8e8e8;
|
||||
border-radius: 8rpx;
|
||||
padding: 16rpx;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.info-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 12rpx 0;
|
||||
border-bottom: 1rpx solid #f5f5f5;
|
||||
}
|
||||
|
||||
.info-label {
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.info-value {
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.info-value.highlight {
|
||||
color: #fa8c16;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.btn-section {
|
||||
padding: 24rpx 0;
|
||||
}
|
||||
|
||||
.btn {
|
||||
font-size: 30rpx;
|
||||
border-radius: 12rpx;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.btn-orange {
|
||||
background: #fa8c16;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.btn-green {
|
||||
background: #0cb306;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.btn-default {
|
||||
background: #fff;
|
||||
color: #666;
|
||||
border: 1rpx solid #d9d9d9;
|
||||
}
|
||||
|
||||
/* ✅ 新增：按钮组容器，让两个按钮并排 */
|
||||
.btn-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: 16rpx; /* 与输入框的间距 */
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
|
||||
/* 按钮基础样式（最大按钮） */
|
||||
.btn-max {
|
||||
font-size: 22rpx;
|
||||
color: #fafafa;
|
||||
background-color: #fa8c16;
|
||||
border: 1rpx solid #fa8c16;
|
||||
border-radius: 8rpx;
|
||||
padding: 0 100rpx;
|
||||
height: 50rpx;
|
||||
line-height: 50rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
/* ✅ 新增：重置按钮样式（与最大按钮之间留一点间距） */
|
||||
.btn-reset {
|
||||
color: #fa8c16;
|
||||
margin-right: 12rpx;
|
||||
background-color: #fff7e6;
|
||||
}
|
||||
|
||||
</style>
|
||||
@@ -30,7 +30,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getMaterialByBarcode, submitSupplyInbound, submitAddEmptyTrayJob} from '@/api/warehouse/inbound'
|
||||
import { getMaterialByBarcode, submitSupplyInbound, submitAddEmptyTrayJob} from '@/api/warehouse/inbound/emptyTray'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
|
||||
@@ -15,14 +15,27 @@
|
||||
<uni-icons type="right" size="18" color="#ccc"></uni-icons>
|
||||
</view>
|
||||
|
||||
<view class="menu-card" @click="navigateTo('/pages/warehouse/inbound/cancelBindTray')">
|
||||
<view class="menu-card" @click="navigateTo('/pages/warehouse/inbound/cancelBindTrayByTrayCode')">
|
||||
<view class="card-left">
|
||||
<view class="card-icon red">
|
||||
<uni-icons type="scan" size="24" color="#fff"></uni-icons>
|
||||
</view>
|
||||
<view class="card-info">
|
||||
<text class="card-title">选择托盘作废绑定信息</text>
|
||||
<text class="card-desc">扫描或输入托盘条码选择版辊绑盘信息作废</text>
|
||||
</view>
|
||||
</view>
|
||||
<uni-icons type="right" size="18" color="#ccc"></uni-icons>
|
||||
</view>
|
||||
|
||||
<view class="menu-card" @click="navigateTo('/pages/warehouse/inbound/cancelBindTrayByRoller')">
|
||||
<view class="card-left">
|
||||
<view class="card-icon orange">
|
||||
<uni-icons type="scan" size="24" color="#fff"></uni-icons>
|
||||
</view>
|
||||
<view class="card-info">
|
||||
<text class="card-title">入库绑盘作废</text>
|
||||
<text class="card-desc">扫描物料条码进行绑盘作废操作</text>
|
||||
<text class="card-title">版辊绑定信息作废</text>
|
||||
<text class="card-desc">扫描或输入辊号执行当前版辊绑盘信息作废</text>
|
||||
</view>
|
||||
</view>
|
||||
<uni-icons type="right" size="18" color="#ccc"></uni-icons>
|
||||
@@ -41,18 +54,6 @@
|
||||
<uni-icons type="right" size="18" color="#ccc"></uni-icons>
|
||||
</view>
|
||||
|
||||
<!-- <view class="menu-card" @click="navigateTo('/pages/warehouse/inbound/supply')">
|
||||
<view class="card-left">
|
||||
<view class="card-icon green">
|
||||
<uni-icons type="plus" size="24" color="#fff"></uni-icons>
|
||||
</view>
|
||||
<view class="card-info">
|
||||
<text class="card-title">补料入库</text>
|
||||
<text class="card-desc">产线补料申请入库操作</text>
|
||||
</view>
|
||||
</view>
|
||||
<uni-icons type="right" size="18" color="#ccc"></uni-icons>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
<!-- 待处理单据 -->
|
||||
@@ -110,7 +111,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getInboundTaskList, getInboundStockList } from '@/api/warehouse/inbound'
|
||||
import { getInboundTaskList, getInboundStockList } from '@/api/warehouse/inbound/index'
|
||||
import UniIcons from "../../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue";
|
||||
|
||||
export default {
|
||||
@@ -213,6 +214,10 @@
|
||||
.card-icon.orange {
|
||||
background: linear-gradient(135deg, #f8b12e, #f5eb69);
|
||||
}
|
||||
|
||||
.card-icon.red {
|
||||
background: linear-gradient(135deg, #df5254, #f56c6e);
|
||||
}
|
||||
|
||||
.card-info {
|
||||
display: flex;
|
||||
|
||||
Reference in New Issue
Block a user