diff --git a/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue b/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue index d29248c3c..d44298c55 100644 --- a/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue +++ b/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue @@ -37,7 +37,8 @@ } from '@/api/index.js'; import { - navigateBack + navigateBack, + goHome } from '@/common/basic.js'; import comRequestDetail from '@/mycomponents/comRequest/comRequestDetail.vue' diff --git a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue index 75291ff8b..03222982d 100644 --- a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue @@ -142,6 +142,9 @@ getCountByItemCode, getRecommendBalance } from '@/api/index.js'; + import { + calc + } from '@/common/calc.js'; import { getJobStatuStyle, getJobStatuDesc, @@ -464,7 +467,15 @@ this.showMessage('发料数量必须大于0'); return; } - that.finsh(); + if(that.details[0].tempHandledToQty>calc.sub(this.allCount,this.scanCount)){ + showConfirmMsg("发料数量大于未发数量,是否提交?",res=>{ + if(res){ + that.finsh(); + } + }) + }else { + that.finsh(); + } }, @@ -536,7 +547,6 @@ return; } item.tempHandledFromQty = value; - console.log('item', item.tempHandledFromQty); this.$forceUpdate(); }, diff --git a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue index 1c49eb552..aea50e668 100644 --- a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue +++ b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue @@ -151,6 +151,9 @@ getCountByItemCode, getRecommendBalance } from '@/api/index.js'; + import { + calc + } from '@/common/calc.js'; import { getJobStatuStyle, getJobStatuDesc, @@ -451,7 +454,7 @@ mask: true }) - getRecommendBalance(itemCode,productLine).then(res=>{ + getRecommendBalance(itemCode,productLine,false).then(res=>{ uni.hideLoading() if (res.length > 0) { var list = []; @@ -511,7 +514,17 @@ this.showMessage('发料数量必须大于0'); return; } - that.finsh(); + + + if(that.details[0].tempHandledToQty>calc.sub(this.allCount,this.scanCount)){ + showConfirmMsg("发料数量大于未发数量,是否提交?",res=>{ + if(res){ + that.finsh(); + } + }) + }else { + that.finsh(); + } }, @@ -583,7 +596,6 @@ return; } item.tempHandledFromQty =value; - console.log('item', item.tempHandledFromQty); this.$forceUpdate(); }, diff --git a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue index dbbe41658..2c0bcfdcb 100644 --- a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue @@ -141,6 +141,9 @@ getCountByItemCode, getRecommendBalance } from '@/api/index.js'; + import { + calc + } from '@/common/calc.js'; import { getJobStatuStyle, getJobStatuDesc, @@ -460,7 +463,15 @@ this.showMessage('发料数量必须大于0'); return; } - that.finsh(); + if(that.details[0].tempHandledToQty>calc.sub(this.allCount,this.scanCount)){ + showConfirmMsg("发料数量大于未发数量,是否提交?",res=>{ + if(res){ + that.finsh(); + } + }) + }else { + that.finsh(); + } }, @@ -532,7 +543,6 @@ return; } item.tempHandledFromQty = value; - console.log('item', item.tempHandledFromQty); this.$forceUpdate(); }, diff --git a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue index f2fb8c164..5436e4fcf 100644 --- a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue @@ -141,6 +141,9 @@ getCountByItemCode, getRecommendBalance } from '@/api/index.js'; + import { + calc + } from '@/common/calc.js'; import { getJobStatuStyle, getJobStatuDesc, @@ -463,7 +466,15 @@ this.showMessage('发料数量必须大于0'); return; } - that.finsh(); + if(that.details[0].tempHandledToQty>calc.sub(this.allCount,this.scanCount)){ + showConfirmMsg("发料数量大于未发数量,是否提交?",res=>{ + if(res){ + that.finsh(); + } + }) + }else { + that.finsh(); + } }, @@ -535,7 +546,6 @@ return; } item.tempHandledFromQty = value; - console.log('item', item.tempHandledFromQty); this.$forceUpdate(); }, diff --git a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue index 9625a6275..edb49f967 100644 --- a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue @@ -141,6 +141,10 @@ getCountByItemCode, getRecommendBalance } from '@/api/index.js'; + + import { + calc + } from '@/common/calc.js'; import { getJobStatuStyle, getJobStatuDesc, @@ -460,7 +464,15 @@ this.showMessage('发料数量必须大于0'); return; } + if(that.details[0].tempHandledToQty>calc.sub(this.allCount,this.scanCount)){ + showConfirmMsg("发料数量大于未发数量,是否提交?",res=>{ + if(res){ + that.finsh(); + } + }) + }else { that.finsh(); + } }, @@ -532,7 +544,6 @@ return; } item.tempHandledFromQty = value; - console.log('item', item.tempHandledFromQty); this.$forceUpdate(); },