|
|
|
@ -9,6 +9,7 @@
|
|
|
|
|
>
|
|
|
|
|
<el-card>
|
|
|
|
|
<el-row style="margin-bottom: 8px">
|
|
|
|
|
<span style="font-size: 18px;font-weight: bold;color: red" v-if="redMesg">请先扫货位码</span>
|
|
|
|
|
<span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>
|
|
|
|
|
<el-button-group
|
|
|
|
|
style="display: flex; margin-top: 5px; float: right"
|
|
|
|
@ -31,6 +32,11 @@
|
|
|
|
|
style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
|
|
|
|
|
>选入单据
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
|
|
|
|
|
style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
|
|
|
|
|
:disabled="orderFormData.billNo == null"
|
|
|
|
|
>放弃
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
|
|
|
|
|
v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"
|
|
|
|
|
>保存
|
|
|
|
@ -343,6 +349,7 @@ import {
|
|
|
|
|
submitCodes,
|
|
|
|
|
submitOrderWeb,
|
|
|
|
|
saveOrderWeb,
|
|
|
|
|
deleteByOrderId,
|
|
|
|
|
enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz,
|
|
|
|
|
batchVailCode, batchAddCode, batchAddCodeByOrderFinish, upProcessing, getProcessingOrder
|
|
|
|
|
} from '@/api/inout/order'
|
|
|
|
@ -625,6 +632,8 @@ export default {
|
|
|
|
|
codeArray: [],
|
|
|
|
|
curQueueName: "",
|
|
|
|
|
curQueue: null,
|
|
|
|
|
redMesg: false,
|
|
|
|
|
redMesgOld: false,
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
components: {
|
|
|
|
@ -697,6 +706,7 @@ export default {
|
|
|
|
|
this.scanCode = ''
|
|
|
|
|
this.corpOrderIdDisabled = false
|
|
|
|
|
this.curQueueName = '';
|
|
|
|
|
this.redMesg = this.redMesgOld
|
|
|
|
|
this.refreshCodesPanel()
|
|
|
|
|
},
|
|
|
|
|
//获取用户仓库列表
|
|
|
|
@ -1077,6 +1087,10 @@ export default {
|
|
|
|
|
{
|
|
|
|
|
let item = this.allWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode)
|
|
|
|
|
this.queueStatus = item.queueStatus
|
|
|
|
|
if (this.queueStatus == 1){
|
|
|
|
|
this.redMesg = true
|
|
|
|
|
this.redMesgOld = true
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
@ -1740,6 +1754,31 @@ export default {
|
|
|
|
|
this.saveLoading = false
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
delOrder() {
|
|
|
|
|
let tQuery = Object.assign(
|
|
|
|
|
JSON.parse(JSON.stringify(this.orderFormData))
|
|
|
|
|
)
|
|
|
|
|
tQuery.billNo = this.orderFormData.billNo
|
|
|
|
|
tQuery.orderType = 2
|
|
|
|
|
if (this.orderFormData.billNo == null) {
|
|
|
|
|
this.$message.error('请先录入单据信息!')
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
this.saveLoading = true
|
|
|
|
|
deleteByOrderId(tQuery).then((response) => {
|
|
|
|
|
this.saveLoading = false
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
|
this.$message.success('放弃成功')
|
|
|
|
|
this.successCloseData()
|
|
|
|
|
this.result = ''
|
|
|
|
|
this.$refs.inputRef.focus()
|
|
|
|
|
} else {
|
|
|
|
|
this.$message.error(response.message)
|
|
|
|
|
}
|
|
|
|
|
this.loading = false
|
|
|
|
|
this.saveLoading = false
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
// 刷新表单
|
|
|
|
|
resetForm() {
|
|
|
|
|
if (this.$refs['dataForm']) {
|
|
|
|
@ -1977,6 +2016,7 @@ export default {
|
|
|
|
|
if (response.code == 20000) {
|
|
|
|
|
this.curQueue = response.data;
|
|
|
|
|
this.curQueueName = "当前货位:" + this.curQueue.name + "(" + this.curQueue.code + ")"
|
|
|
|
|
this.redMesg = false
|
|
|
|
|
this.orderFormData.workPlaceQueueCode = this.curQueue.code
|
|
|
|
|
this.scanCode = '';
|
|
|
|
|
}else {
|
|
|
|
|