diff --git a/src/views/basic/workplace/addWorkplaceFreightDialog.vue b/src/views/basic/workplace/addWorkplaceFreightDialog.vue index ccc1d0e6..88a862f2 100644 --- a/src/views/basic/workplace/addWorkplaceFreightDialog.vue +++ b/src/views/basic/workplace/addWorkplaceFreightDialog.vue @@ -126,7 +126,7 @@ 删除 @@ -309,10 +309,10 @@ export default { }, createLayerCode(lastLayer) { let code - code = lastLayer.code.replace(this.formData.code, '') + code = lastLayer.code.slice(lastLayer.code.indexOf('-') + 1); code = parseInt(code, 10) + 1 let incrementedValue = code.toString().padStart(2, '0') - code = this.formData.code + incrementedValue + code = this.formData.code + "-" + incrementedValue return code }, @@ -353,7 +353,7 @@ export default { } }) }, - handleDel(row){ + handleDel(index,row){ if (this.saveStatus == true){ return this.$message.error("请保存数据") } @@ -369,6 +369,8 @@ export default { if (res.code == 20000){ this.getLayers() this.$message.success("删除成功") + }else if (res.code == 501){ + this.layerList.splice(index, 1); }else { this.$message.error("删除失败") } diff --git a/src/views/collect/IocCollectOrderVerify.vue b/src/views/collect/IocCollectOrderVerify.vue index 6967f631..4c6dec3e 100644 --- a/src/views/collect/IocCollectOrderVerify.vue +++ b/src/views/collect/IocCollectOrderVerify.vue @@ -230,7 +230,7 @@ export default { billNo: null, tagStatus: 3, workPlaceCode: null, - busType: null + busType: null, }, codeQuery: { billNo: null, @@ -326,6 +326,10 @@ export default { this.orderQuery.busType = this.busType orderFinish(this.orderQuery).then(res => { if (res.code == 20000) { + if (res.data.list[0].checkCodeStatus == 1){ + this.initData() + return this.$message.error("当前单据已经校验") + } this.placeholder = '已选入单据,请扫描追溯码进行校验' this.scanTip = '扫码校验' this.orderData = res.data.list[0] @@ -607,7 +611,20 @@ export default { }) } else { - this.commit() + this.$confirm('是否完成当前单据校验', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + center: true, + closeOnPressEscape: false,//按下 ESC 键关闭弹窗 + closeOnClickModal: false,//点击遮罩关闭弹窗 + distinguishCancelAndClose: true//区分取消与关闭 + }).then(() => { + this.commit() + }).catch(() => { + + }) + } }, commit() {