|
|
|
@ -116,13 +116,13 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- 第四行:扫进/扫回 + 扫描按钮,保持与原PDA页面一致 - rqrq --> |
|
|
|
<!-- 分拣工作盘只允许扫进;被分拣源盘仍可放回或解绑 - rqrq --> |
|
|
|
<div v-if="palletScanned" class="input-group"> |
|
|
|
<div style="display: flex; gap: 8px; align-items: center;"> |
|
|
|
<div style="flex: 0.75;"> |
|
|
|
<el-radio-group v-model="operationType" style="display: flex;"> |
|
|
|
<el-radio label="in" style="margin-right: 0px; white-space: nowrap;">{{ sortedSourceFlag ? '放回' : '扫进' }}</el-radio> |
|
|
|
<el-radio label="out" style="white-space: nowrap;">{{ sortedSourceFlag ? '解绑' : '扫回' }}</el-radio> |
|
|
|
<el-radio v-if="sortedSourceFlag" label="out" style="white-space: nowrap;">解绑</el-radio> |
|
|
|
</el-radio-group> |
|
|
|
</div> |
|
|
|
<button |
|
|
|
@ -763,6 +763,10 @@ export default { |
|
|
|
this.positionOptions = data.positions || [] |
|
|
|
this.palletScanned = true |
|
|
|
this.sortedSourceFlag = data.sortedSourceFlag === true |
|
|
|
// 分拣工作盘没有扫回,扫到工作盘时固定为扫进,避免沿用上一只被分拣盘的解绑选项 - rqrq |
|
|
|
if (!this.sortedSourceFlag) { |
|
|
|
this.operationType = 'in' |
|
|
|
} |
|
|
|
this.scanCode = '' |
|
|
|
this.scanPosition = '' |
|
|
|
this.scanLayer = 1 |
|
|
|
@ -925,6 +929,10 @@ export default { |
|
|
|
}, |
|
|
|
// 打开扫码弹窗并初始化网格数据,交互与原PDA页面一致 - rqrq |
|
|
|
showScanModal() { |
|
|
|
// 分拣工作盘只能扫进,打开弹窗前清掉扫回状态 - rqrq |
|
|
|
if (!this.sortedSourceFlag) { |
|
|
|
this.operationType = 'in' |
|
|
|
} |
|
|
|
this.scanModalVisible = true |
|
|
|
this.scanCode = '' |
|
|
|
// 每次打开扫码弹窗清除上次托盘的位置,防止尚未加载新位置时误扫到旧位置 - rqrq |
|
|
|
@ -1104,6 +1112,10 @@ export default { |
|
|
|
if (this.interfaceBusy) { |
|
|
|
return |
|
|
|
} |
|
|
|
// 分拣工作盘不提供扫回,即使操作类型残留为扫出也按扫进处理 - rqrq |
|
|
|
if (!this.sortedSourceFlag) { |
|
|
|
this.operationType = 'in' |
|
|
|
} |
|
|
|
if (!this.scanCode || !this.scanCode.trim()) { |
|
|
|
this.scanCode = '' |
|
|
|
this.$alert('请输入标签编码', '错误', { confirmButtonText: '确定' }) |
|
|
|
|