|
|
|
@ -87,23 +87,17 @@ |
|
|
|
</el-checkbox> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- 第三行：筛选条件 (扫描栈板后显示) --> |
|
|
|
<!-- 第三行：当前栈板站点显示 (扫描栈板后显示) - rqrq --> |
|
|
|
<div v-if="palletScanned" class="input-group"> |
|
|
|
<label class="input-label">位置</label> |
|
|
|
<label class="input-label">当前站点</label> |
|
|
|
<div style="display: flex; gap: 8px;"> |
|
|
|
<el-select |
|
|
|
v-model="selectedPosition" |
|
|
|
placeholder="请选择位置" |
|
|
|
style="flex: 0.75;" |
|
|
|
> |
|
|
|
<el-option label="ALL" value=""></el-option> |
|
|
|
<el-option |
|
|
|
v-for="position in positionOptions" |
|
|
|
:key="position" |
|
|
|
:label="position" |
|
|
|
:value="position" |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
<el-input |
|
|
|
v-model="currentPalletStation" |
|
|
|
placeholder="栈板当前站点" |
|
|
|
class="form-input" |
|
|
|
readonly |
|
|
|
style="flex: 0.75;"> |
|
|
|
</el-input> |
|
|
|
<button |
|
|
|
class="action-btn secondary" |
|
|
|
style="flex: 0.25; margin: 0; white-space: nowrap;" |
|
|
|
@ -596,6 +590,7 @@ export default { |
|
|
|
selectedLayer: '', |
|
|
|
positionOptions: [], |
|
|
|
layerOptions: [], |
|
|
|
currentPalletStation: '', // 当前栈板站点 - rqrq |
|
|
|
|
|
|
|
// 扫码模态框 - rqrq |
|
|
|
scanModalVisible: false, |
|
|
|
@ -680,6 +675,7 @@ export default { |
|
|
|
this.selectedLayer = ''; |
|
|
|
this.positionOptions = []; |
|
|
|
this.layerOptions = []; |
|
|
|
this.currentPalletStation = ''; // 清空当前站点 - rqrq |
|
|
|
|
|
|
|
// 清空栈板明细 |
|
|
|
this.detailList = []; |
|
|
|
@ -793,6 +789,28 @@ export default { |
|
|
|
this.currentPalletFamily = palletInfo.palletFamily || ''; |
|
|
|
this.currentPalletType = palletInfo.palletType || ''; |
|
|
|
this.currentAutoSort = palletInfo.autoSort || 'N'; |
|
|
|
this.currentPalletStation = palletInfo.locationCode || ''; // 获取当前站点 - rqrq |
|
|
|
|
|
|
|
// 组盘界面：校验栈板站点不能是R1/R2/R3/R4 - rqrq |
|
|
|
const forbiddenStations = ['R1', 'R2', 'R3', 'R4']; |
|
|
|
if (this.currentPalletStation && forbiddenStations.includes(this.currentPalletStation)) { |
|
|
|
this.$alert( |
|
|
|
`组盘功能不能在R1/R2/R3/R4站点使用，当前栈板站点为：${this.currentPalletStation}`, |
|
|
|
'站点错误', |
|
|
|
{ |
|
|
|
confirmButtonText: '确定', |
|
|
|
callback: () => { |
|
|
|
this.resetPage(); |
|
|
|
this.$nextTick(() => { |
|
|
|
if (this.$refs.palletInput) { |
|
|
|
this.$refs.palletInput.focus(); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
// 第一次进页面扫描栈板查询的时候，如果sore_Type=3，那么也要显示勾选 - rqrq |
|
|
|
const soreType = palletInfo.soreType; |
|
|
|
@ -1583,7 +1601,8 @@ export default { |
|
|
|
callPalletToStationWithUpdateZuPan({ |
|
|
|
site: this.site, |
|
|
|
startStation: this.currentPalletStation, |
|
|
|
targetArea: this.selectedTargetArea |
|
|
|
targetArea: this.selectedTargetArea, |
|
|
|
palletId: this.palletCode |
|
|
|
}).then(({ data }) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.$message.success('栈板运输任务创建成功'); |
|
|
|
|
